Module Name: src
Committed By: plunky
Date: Fri Apr 6 20:33:20 UTC 2012
Modified Files:
src/sys/dev/isa: pcppi.c
Log Message:
device_pmf_is_registered() is not required
To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 src/sys/dev/isa/pcppi.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/dev/isa/pcppi.c
diff -u src/sys/dev/isa/pcppi.c:1.41 src/sys/dev/isa/pcppi.c:1.42
--- src/sys/dev/isa/pcppi.c:1.41 Sat Nov 26 15:54:51 2011
+++ src/sys/dev/isa/pcppi.c Fri Apr 6 20:33:20 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: pcppi.c,v 1.41 2011/11/26 15:54:51 drochner Exp $ */
+/* $NetBSD: pcppi.c,v 1.42 2012/04/06 20:33:20 plunky Exp $ */
/*
* Copyright (c) 1996 Carnegie-Mellon University.
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pcppi.c,v 1.41 2011/11/26 15:54:51 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pcppi.c,v 1.42 2012/04/06 20:33:20 plunky Exp $");
#include "attimer.h"
@@ -229,10 +229,8 @@ pcppi_attach(struct pcppi_softc *sc)
#if NATTIMER > 0
config_defer(sc->sc_dv, pcppi_attach_speaker);
#endif
- 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");
pa.pa_cookie = sc;
config_search_loc(pcppisearch, sc->sc_dv, "pcppi", NULL, &pa);
