[src/trunk]: src/sys/dev/ic Simplify device-activation hook.

[dyoung <dyoung%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/6f304036a411
branches:  trunk
changeset: 749744:6f304036a411
user:      dyoung <dyoung%NetBSD.org@localhost>
date:      Sun Dec 06 23:14:39 2009 +0000

description:
Simplify device-activation hook.

diffstat:

 sys/dev/ic/tropic.c |  21 +++++++--------------
 1 files changed, 7 insertions(+), 14 deletions(-)

diffs (46 lines):

diff -r 7a2a9651b386 -r 6f304036a411 sys/dev/ic/tropic.c
--- a/sys/dev/ic/tropic.c       Sun Dec 06 23:14:05 2009 +0000
+++ b/sys/dev/ic/tropic.c       Sun Dec 06 23:14:39 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: tropic.c,v 1.39 2009/05/12 14:25:18 cegger Exp $       */
+/*     $NetBSD: tropic.c,v 1.40 2009/12/06 23:14:39 dyoung Exp $       */
 
 /*
  * Ported to NetBSD by Onno van der Linden
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tropic.c,v 1.39 2009/05/12 14:25:18 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tropic.c,v 1.40 2009/12/06 23:14:39 dyoung Exp $");
 
 #include "opt_inet.h"
 #include "bpfilter.h"
@@ -1721,22 +1721,15 @@
 int
 tr_activate(device_t self, enum devact act)
 {
-       struct tr_softc *sc = (struct tr_softc *)self;
-       struct ifnet *ifp = &sc->sc_ethercom.ec_if;
-       int rv = 0, s;
+       struct tr_softc *sc = device_private(self);
 
-       s = splnet();
        switch (act) {
-       case DVACT_ACTIVATE:
-               rv = EOPNOTSUPP;
-               break;
-
        case DVACT_DEACTIVATE:
-               if_deactivate(ifp);
-               break;
+               if_deactivate(&sc->sc_ethercom.ec_if);
+               return 0;
+       default:
+               return EOPNOTSUPP;
        }
-       splx(s);
-       return (rv);
 }
 
 int