Module Name: src
Committed By: dyoung
Date: Sun Dec 6 22:56:56 UTC 2009
Modified Files:
src/sys/dev/ieee1394: if_fwip.c
Log Message:
Simplify device-activation hook.
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sys/dev/ieee1394/if_fwip.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/ieee1394/if_fwip.c
diff -u src/sys/dev/ieee1394/if_fwip.c:1.19 src/sys/dev/ieee1394/if_fwip.c:1.20
--- src/sys/dev/ieee1394/if_fwip.c:1.19 Tue May 12 12:16:55 2009
+++ src/sys/dev/ieee1394/if_fwip.c Sun Dec 6 22:56:56 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: if_fwip.c,v 1.19 2009/05/12 12:16:55 cegger Exp $ */
+/* $NetBSD: if_fwip.c,v 1.20 2009/12/06 22:56:56 dyoung Exp $ */
/*-
* Copyright (c) 2004
* Doug Rabson
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_fwip.c,v 1.19 2009/05/12 12:16:55 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_fwip.c,v 1.20 2009/12/06 22:56:56 dyoung Exp $");
#ifdef HAVE_KERNEL_OPTION_HEADERS
#include "opt_device_polling.h"
@@ -395,29 +395,20 @@
return 0;
}
-#if defined(__NetBSD__)
int
fwipactivate(device_t self, enum devact act)
{
struct fwip_softc *fwip = device_private(self);
- int s, error = 0;
- s = splfwnet();
switch (act) {
- case DVACT_ACTIVATE:
- error = EOPNOTSUPP;
- break;
-
case DVACT_DEACTIVATE:
if_deactivate(fwip->fw_softc.fwip_ifp);
- break;
+ return 0;
+ default:
+ return EOPNOTSUPP;
}
- splx(s);
-
- return (error);
}
-#endif
IF_INIT(fwip)
{
IF_INIT_START(fwip, fwip, ifp);
