Module Name: src
Committed By: plunky
Date: Fri Apr 6 20:16:59 UTC 2012
Modified Files:
src/sys/dev/isa: spkr.c
Log Message:
device_pmf_is_registered() is not required
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/sys/dev/isa/spkr.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/spkr.c
diff -u src/sys/dev/isa/spkr.c:1.32 src/sys/dev/isa/spkr.c:1.33
--- src/sys/dev/isa/spkr.c:1.32 Wed Feb 1 02:01:28 2012
+++ src/sys/dev/isa/spkr.c Fri Apr 6 20:16:58 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: spkr.c,v 1.32 2012/02/01 02:01:28 matt Exp $ */
+/* $NetBSD: spkr.c,v 1.33 2012/04/06 20:16:58 plunky Exp $ */
/*
* Copyright (c) 1990 Eric S. Raymond ([email protected])
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: spkr.c,v 1.32 2012/02/01 02:01:28 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: spkr.c,v 1.33 2012/04/06 20:16:58 plunky Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -409,10 +409,8 @@ spkrattach(device_t parent, device_t sel
printf("\n");
ppicookie = ((struct pcppi_attach_args *)aux)->pa_cookie;
spkr_attached = 1;
- if (!device_pmf_is_registered(self)
- && !pmf_device_register(self, NULL, NULL))
+ if (!pmf_device_register(self, NULL, NULL))
aprint_error_dev(self, "couldn't establish power handler\n");
-
}
int
