Module Name: src
Committed By: plunky
Date: Fri Apr 6 20:38:52 UTC 2012
Modified Files:
src/sys/arch/x86/pci: pcib.c
Log Message:
device_pmf_is_registered() is not required
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/x86/pci/pcib.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x86/pci/pcib.c
diff -u src/sys/arch/x86/pci/pcib.c:1.14 src/sys/arch/x86/pci/pcib.c:1.15
--- src/sys/arch/x86/pci/pcib.c:1.14 Mon Jan 30 19:41:18 2012
+++ src/sys/arch/x86/pci/pcib.c Fri Apr 6 20:38:52 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: pcib.c,v 1.14 2012/01/30 19:41:18 drochner Exp $ */
+/* $NetBSD: pcib.c,v 1.15 2012/04/06 20:38:52 plunky Exp $ */
/*-
* Copyright (c) 1996, 1998 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pcib.c,v 1.14 2012/01/30 19:41:18 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pcib.c,v 1.15 2012/04/06 20:38:52 plunky Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -195,13 +195,8 @@ pcibattach(device_t parent, device_t sel
sc->sc_pc = pa->pa_pc;
sc->sc_tag = pa->pa_tag;
- /* If a more specific pcib implementation has already registered a
- * power handler, don't overwrite it.
- */
- if (!device_pmf_is_registered(self)) {
- if (!pmf_device_register(self, NULL, NULL))
- aprint_error_dev(self, "couldn't establish power handler\n");
- }
+ if (!pmf_device_register(self, NULL, NULL))
+ aprint_error_dev(self, "couldn't establish power handler\n");
config_defer(self, pcib_callback);
}
