Module Name: src
Committed By: dyoung
Date: Sun Dec 6 22:40:56 UTC 2009
Modified Files:
src/sys/dev/ir: cir.c irframe.c
Log Message:
Delete unnecessary device-activation hooks.
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/sys/dev/ir/cir.c
cvs rdiff -u -r1.43 -r1.44 src/sys/dev/ir/irframe.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/ir/cir.c
diff -u src/sys/dev/ir/cir.c:1.25 src/sys/dev/ir/cir.c:1.26
--- src/sys/dev/ir/cir.c:1.25 Tue May 12 14:29:42 2009
+++ src/sys/dev/ir/cir.c Sun Dec 6 22:40:56 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: cir.c,v 1.25 2009/05/12 14:29:42 cegger Exp $ */
+/* $NetBSD: cir.c,v 1.26 2009/12/06 22:40:56 dyoung Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cir.c,v 1.25 2009/05/12 14:29:42 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cir.c,v 1.26 2009/12/06 22:40:56 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -61,11 +61,10 @@
int cir_match(device_t parent, cfdata_t match, void *aux);
void cir_attach(device_t parent, device_t self, void *aux);
-int cir_activate(device_t self, enum devact act);
int cir_detach(device_t self, int flags);
CFATTACH_DECL(cir, sizeof(struct cir_softc),
- cir_match, cir_attach, cir_detach, cir_activate);
+ cir_match, cir_attach, cir_detach, NULL);
extern struct cfdriver cir_cd;
@@ -99,22 +98,6 @@
}
int
-cir_activate(device_t self, enum devact act)
-{
- /*struct cir_softc *sc = device_private(self);*/
-
- switch (act) {
- case DVACT_ACTIVATE:
- return (EOPNOTSUPP);
- break;
-
- case DVACT_DEACTIVATE:
- break;
- }
- return (0);
-}
-
-int
cir_detach(device_t self, int flags)
{
struct cir_softc *sc = device_private(self);
Index: src/sys/dev/ir/irframe.c
diff -u src/sys/dev/ir/irframe.c:1.43 src/sys/dev/ir/irframe.c:1.44
--- src/sys/dev/ir/irframe.c:1.43 Sun Jan 11 14:21:48 2009
+++ src/sys/dev/ir/irframe.c Sun Dec 6 22:40:56 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: irframe.c,v 1.43 2009/01/11 14:21:48 mlelstv Exp $ */
+/* $NetBSD: irframe.c,v 1.44 2009/12/06 22:40:56 dyoung Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: irframe.c,v 1.43 2009/01/11 14:21:48 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: irframe.c,v 1.44 2009/12/06 22:40:56 dyoung Exp $");
#include "irframe.h"
@@ -72,7 +72,6 @@
};
int irframe_match(device_t parent, cfdata_t match, void *aux);
-int irframe_activate(device_t self, enum devact act);
Static int irf_set_params(struct irframe_softc *sc, struct irda_params *p);
Static int irf_reset_params(struct irframe_softc *sc);
@@ -83,7 +82,7 @@
#endif
CFATTACH_DECL_NEW(irframe, sizeof(struct irframe_softc),
- irframe_match, irframe_attach, irframe_detach, irframe_activate);
+ irframe_match, irframe_attach, irframe_detach, NULL);
extern struct cfdriver irframe_cd;
@@ -146,21 +145,6 @@
}
int
-irframe_activate(device_t self, enum devact act)
-{
- /*struct irframe_softc *sc = device_private(self);*/
-
- switch (act) {
- case DVACT_ACTIVATE:
- return (EOPNOTSUPP);
-
- case DVACT_DEACTIVATE:
- break;
- }
- return (0);
-}
-
-int
irframe_detach(device_t self, int flags)
{
/*struct irframe_softc *sc = device_private(self);*/
