[src/trunk]: src/sys/dev/usb Simplify activation hook.

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

details:   https://anonhg.NetBSD.org/src/rev/6be11ee214a5
branches:  trunk
changeset: 748993:6be11ee214a5
user:      dyoung <dyoung%NetBSD.org@localhost>
date:      Thu Nov 12 19:46:01 2009 +0000

description:
Simplify activation hook.

(sc_dying must die!)

diffstat:

 sys/dev/usb/ehci.c |  15 +++++----------
 1 files changed, 5 insertions(+), 10 deletions(-)

diffs (41 lines):

diff -r 5606a4c976e7 -r 6be11ee214a5 sys/dev/usb/ehci.c
--- a/sys/dev/usb/ehci.c        Thu Nov 12 19:44:17 2009 +0000
+++ b/sys/dev/usb/ehci.c        Thu Nov 12 19:46:01 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ehci.c,v 1.162 2009/11/01 13:26:50 uebayasi Exp $ */
+/*     $NetBSD: ehci.c,v 1.163 2009/11/12 19:46:01 dyoung Exp $ */
 
 /*
  * Copyright (c) 2004-2008 The NetBSD Foundation, Inc.
@@ -52,7 +52,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.162 2009/11/01 13:26:50 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.163 2009/11/12 19:46:01 dyoung Exp $");
 
 #include "ohci.h"
 #include "uhci.h"
@@ -1102,19 +1102,14 @@
 ehci_activate(device_t self, enum devact act)
 {
        struct ehci_softc *sc = device_private(self);
-       int rv = 0;
 
        switch (act) {
-       case DVACT_ACTIVATE:
-               return (EOPNOTSUPP);
-
        case DVACT_DEACTIVATE:
                sc->sc_dying = 1;
-               if (sc->sc_child != NULL)
-                       rv = config_deactivate(sc->sc_child);
-               break;
+               return 0;
+       default:
+               return EOPNOTSUPP;
        }
-       return (rv);
 }
 
 /*