diff options
Diffstat (limited to 'sys/dev/usb')
71 files changed, 71 insertions, 263 deletions
diff --git a/sys/dev/usb/ehci.c b/sys/dev/usb/ehci.c index 65bfdf6f35c..cd7041ec3f8 100644 --- a/sys/dev/usb/ehci.c +++ b/sys/dev/usb/ehci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ehci.c,v 1.116 2011/06/23 16:02:33 tedu Exp $ */ +/* $OpenBSD: ehci.c,v 1.117 2011/07/03 15:47:17 matthew Exp $ */ /* $NetBSD: ehci.c,v 1.66 2004/06/30 03:11:56 mycroft Exp $ */ /* @@ -1063,8 +1063,6 @@ ehci_activate(struct device *self, int act) int i, rv = 0; switch (act) { - case DVACT_ACTIVATE: - break; case DVACT_QUIESCE: rv = config_activate_children(self, act); break; diff --git a/sys/dev/usb/if_athn_usb.c b/sys/dev/usb/if_athn_usb.c index ba23373f482..def833ef95d 100644 --- a/sys/dev/usb/if_athn_usb.c +++ b/sys/dev/usb/if_athn_usb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_athn_usb.c,v 1.7 2011/01/25 20:03:35 jakemsr Exp $ */ +/* $OpenBSD: if_athn_usb.c,v 1.8 2011/07/03 15:47:17 matthew Exp $ */ /*- * Copyright (c) 2011 Damien Bergamini <damien.bergamini@free.fr> @@ -311,8 +311,6 @@ athn_usb_activate(struct device *self, int act) struct athn_usb_softc *usc = (struct athn_usb_softc *)self; switch (act) { - case DVACT_ACTIVATE: - break; case DVACT_DEACTIVATE: usbd_deactivate(usc->sc_udev); break; diff --git a/sys/dev/usb/if_atu.c b/sys/dev/usb/if_atu.c index 7aeae194dba..3b999b953b6 100644 --- a/sys/dev/usb/if_atu.c +++ b/sys/dev/usb/if_atu.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_atu.c,v 1.98 2010/12/17 22:38:54 jasper Exp $ */ +/* $OpenBSD: if_atu.c,v 1.99 2011/07/03 15:47:17 matthew Exp $ */ /* * Copyright (c) 2003, 2004 * Daan Vreeken <Danovitsch@Vitsch.net>. All rights reserved. @@ -1521,8 +1521,6 @@ atu_activate(struct device *self, int act) struct atu_softc *sc = (struct atu_softc *)self; switch (act) { - case DVACT_ACTIVATE: - break; case DVACT_DEACTIVATE: usbd_deactivate(sc->atu_udev); break; diff --git a/sys/dev/usb/if_aue.c b/sys/dev/usb/if_aue.c index b814896aa3f..a44f37f69f0 100644 --- a/sys/dev/usb/if_aue.c +++ b/sys/dev/usb/if_aue.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_aue.c,v 1.84 2011/01/25 20:03:35 jakemsr Exp $ */ +/* $OpenBSD: if_aue.c,v 1.85 2011/07/03 15:47:17 matthew Exp $ */ /* $NetBSD: if_aue.c,v 1.82 2003/03/05 17:37:36 shiba Exp $ */ /* * Copyright (c) 1997, 1998, 1999, 2000 @@ -895,9 +895,6 @@ aue_activate(struct device *self, int act) DPRINTFN(2,("%s: %s: enter\n", sc->aue_dev.dv_xname, __func__)); switch (act) { - case DVACT_ACTIVATE: - break; - case DVACT_DEACTIVATE: usbd_deactivate(sc->aue_udev); break; diff --git a/sys/dev/usb/if_axe.c b/sys/dev/usb/if_axe.c index 559c19a9b02..bf5287d2847 100644 --- a/sys/dev/usb/if_axe.c +++ b/sys/dev/usb/if_axe.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_axe.c,v 1.105 2011/01/25 20:03:35 jakemsr Exp $ */ +/* $OpenBSD: if_axe.c,v 1.106 2011/07/03 15:47:17 matthew Exp $ */ /* * Copyright (c) 2005, 2006, 2007 Jonathan Gray <jsg@openbsd.org> @@ -884,9 +884,6 @@ axe_activate(struct device *self, int act) DPRINTFN(2,("%s: %s: enter\n", sc->axe_dev.dv_xname, __func__)); switch (act) { - case DVACT_ACTIVATE: - break; - case DVACT_DEACTIVATE: usbd_deactivate(sc->axe_udev); break; diff --git a/sys/dev/usb/if_cdce.c b/sys/dev/usb/if_cdce.c index 5af1b42e044..bc5cccac63d 100644 --- a/sys/dev/usb/if_cdce.c +++ b/sys/dev/usb/if_cdce.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_cdce.c,v 1.49 2011/01/25 20:03:35 jakemsr Exp $ */ +/* $OpenBSD: if_cdce.c,v 1.50 2011/07/03 15:47:17 matthew Exp $ */ /* * Copyright (c) 1997, 1998, 1999, 2000-2003 Bill Paul <wpaul@windriver.com> @@ -872,9 +872,6 @@ cdce_activate(struct device *self, int act) struct cdce_softc *sc = (struct cdce_softc *)self; switch (act) { - case DVACT_ACTIVATE: - break; - case DVACT_DEACTIVATE: sc->cdce_dying = 1; break; diff --git a/sys/dev/usb/if_cue.c b/sys/dev/usb/if_cue.c index 7effeda01dd..a1eeda2e121 100644 --- a/sys/dev/usb/if_cue.c +++ b/sys/dev/usb/if_cue.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_cue.c,v 1.59 2011/01/25 20:03:35 jakemsr Exp $ */ +/* $OpenBSD: if_cue.c,v 1.60 2011/07/03 15:47:17 matthew Exp $ */ /* $NetBSD: if_cue.c,v 1.40 2002/07/11 21:14:26 augustss Exp $ */ /* * Copyright (c) 1997, 1998, 1999, 2000 @@ -594,9 +594,6 @@ cue_activate(struct device *self, int act) DPRINTFN(2,("%s: %s: enter\n", sc->cue_dev.dv_xname, __func__)); switch (act) { - case DVACT_ACTIVATE: - break; - case DVACT_DEACTIVATE: usbd_deactivate(sc->cue_udev); break; diff --git a/sys/dev/usb/if_kue.c b/sys/dev/usb/if_kue.c index f989a438838..80076308bc2 100644 --- a/sys/dev/usb/if_kue.c +++ b/sys/dev/usb/if_kue.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_kue.c,v 1.63 2011/01/25 20:03:35 jakemsr Exp $ */ +/* $OpenBSD: if_kue.c,v 1.64 2011/07/03 15:47:17 matthew Exp $ */ /* $NetBSD: if_kue.c,v 1.50 2002/07/16 22:00:31 augustss Exp $ */ /* * Copyright (c) 1997, 1998, 1999, 2000 @@ -593,9 +593,6 @@ kue_activate(struct device *self, int act) DPRINTFN(2,("%s: %s: enter\n", sc->kue_dev.dv_xname, __func__)); switch (act) { - case DVACT_ACTIVATE: - break; - case DVACT_DEACTIVATE: sc->kue_dying = 1; break; diff --git a/sys/dev/usb/if_mos.c b/sys/dev/usb/if_mos.c index a8c6447f096..4489b4ab5d9 100644 --- a/sys/dev/usb/if_mos.c +++ b/sys/dev/usb/if_mos.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_mos.c,v 1.14 2011/02/21 19:48:41 stsp Exp $ */ +/* $OpenBSD: if_mos.c,v 1.15 2011/07/03 15:47:17 matthew Exp $ */ /* * Copyright (c) 2008 Johann Christian Rode <jcrode@gmx.net> @@ -823,9 +823,6 @@ mos_activate(struct device *self, int act) DPRINTFN(2,("%s: %s: enter\n", sc->mos_dev.dv_xname, __func__)); switch (act) { - case DVACT_ACTIVATE: - break; - case DVACT_DEACTIVATE: usbd_deactivate(sc->mos_udev); break; diff --git a/sys/dev/usb/if_otus.c b/sys/dev/usb/if_otus.c index 7b0e9147d74..533cf42490a 100644 --- a/sys/dev/usb/if_otus.c +++ b/sys/dev/usb/if_otus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_otus.c,v 1.30 2011/02/10 17:26:40 jakemsr Exp $ */ +/* $OpenBSD: if_otus.c,v 1.31 2011/07/03 15:47:17 matthew Exp $ */ /*- * Copyright (c) 2009 Damien Bergamini <damien.bergamini@free.fr> @@ -274,9 +274,6 @@ otus_activate(struct device *self, int act) struct otus_softc *sc = (struct otus_softc *)self; switch (act) { - case DVACT_ACTIVATE: - break; - case DVACT_DEACTIVATE: usbd_deactivate(sc->sc_udev); break; diff --git a/sys/dev/usb/if_ral.c b/sys/dev/usb/if_ral.c index c1df5018544..a764fa4ea20 100644 --- a/sys/dev/usb/if_ral.c +++ b/sys/dev/usb/if_ral.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ral.c,v 1.120 2011/01/25 20:03:35 jakemsr Exp $ */ +/* $OpenBSD: if_ral.c,v 1.121 2011/07/03 15:47:17 matthew Exp $ */ /*- * Copyright (c) 2005, 2006 @@ -2232,9 +2232,6 @@ ural_activate(struct device *self, int act) struct ural_softc *sc = (struct ural_softc *)self; switch (act) { - case DVACT_ACTIVATE: - break; - case DVACT_DEACTIVATE: usbd_deactivate(sc->sc_udev); break; diff --git a/sys/dev/usb/if_rsu.c b/sys/dev/usb/if_rsu.c index 9520e7c1331..5789836024f 100644 --- a/sys/dev/usb/if_rsu.c +++ b/sys/dev/usb/if_rsu.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_rsu.c,v 1.13 2011/02/10 17:26:40 jakemsr Exp $ */ +/* $OpenBSD: if_rsu.c,v 1.14 2011/07/03 15:47:17 matthew Exp $ */ /*- * Copyright (c) 2010 Damien Bergamini <damien.bergamini@free.fr> @@ -373,8 +373,6 @@ rsu_activate(struct device *self, int act) struct rsu_softc *sc = (struct rsu_softc *)self; switch (act) { - case DVACT_ACTIVATE: - break; case DVACT_DEACTIVATE: usbd_deactivate(sc->sc_udev); break; diff --git a/sys/dev/usb/if_rum.c b/sys/dev/usb/if_rum.c index 4cf6b23aa78..c561600d584 100644 --- a/sys/dev/usb/if_rum.c +++ b/sys/dev/usb/if_rum.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_rum.c,v 1.97 2011/01/25 20:03:35 jakemsr Exp $ */ +/* $OpenBSD: if_rum.c,v 1.98 2011/07/03 15:47:17 matthew Exp $ */ /*- * Copyright (c) 2005-2007 Damien Bergamini <damien.bergamini@free.fr> @@ -2306,9 +2306,6 @@ rum_activate(struct device *self, int act) struct rum_softc *sc = (struct rum_softc *)self; switch (act) { - case DVACT_ACTIVATE: - break; - case DVACT_DEACTIVATE: usbd_deactivate(sc->sc_udev); break; diff --git a/sys/dev/usb/if_run.c b/sys/dev/usb/if_run.c index 250b08a9e9e..2165ec04c93 100644 --- a/sys/dev/usb/if_run.c +++ b/sys/dev/usb/if_run.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_run.c,v 1.88 2011/02/10 17:26:40 jakemsr Exp $ */ +/* $OpenBSD: if_run.c,v 1.89 2011/07/03 15:47:17 matthew Exp $ */ /*- * Copyright (c) 2008-2010 Damien Bergamini <damien.bergamini@free.fr> @@ -3554,9 +3554,6 @@ run_activate(struct device *self, int act) struct run_softc *sc = (struct run_softc *)self; switch (act) { - case DVACT_ACTIVATE: - break; - case DVACT_DEACTIVATE: usbd_deactivate(sc->sc_udev); break; diff --git a/sys/dev/usb/if_uath.c b/sys/dev/usb/if_uath.c index cb75a93a3a7..7844b79a410 100644 --- a/sys/dev/usb/if_uath.c +++ b/sys/dev/usb/if_uath.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_uath.c,v 1.50 2011/04/07 15:30:16 miod Exp $ */ +/* $OpenBSD: if_uath.c,v 1.51 2011/07/03 15:47:17 matthew Exp $ */ /*- * Copyright (c) 2006 @@ -2126,9 +2126,6 @@ uath_activate(struct device *self, int act) struct uath_softc *sc = (struct uath_softc *)self; switch (act) { - case DVACT_ACTIVATE: - break; - case DVACT_DEACTIVATE: usbd_deactivate(sc->sc_udev); break; diff --git a/sys/dev/usb/if_udav.c b/sys/dev/usb/if_udav.c index 50f7f0140a1..1daeb2abde5 100644 --- a/sys/dev/usb/if_udav.c +++ b/sys/dev/usb/if_udav.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_udav.c,v 1.56 2011/06/23 16:31:16 deraadt Exp $ */ +/* $OpenBSD: if_udav.c,v 1.57 2011/07/03 15:47:17 matthew Exp $ */ /* $NetBSD: if_udav.c,v 1.3 2004/04/23 17:25:25 itojun Exp $ */ /* $nabe: if_udav.c,v 1.3 2003/08/21 16:57:19 nabe Exp $ */ /* @@ -721,9 +721,6 @@ udav_activate(struct device *self, int act) DPRINTF(("%s: %s: enter, act=%d\n", sc->sc_dev.dv_xname, __func__, act)); switch (act) { - case DVACT_ACTIVATE: - break; - case DVACT_DEACTIVATE: usbd_deactivate(sc->sc_udev); break; diff --git a/sys/dev/usb/if_upgt.c b/sys/dev/usb/if_upgt.c index b2f26ae00f7..83107bba766 100644 --- a/sys/dev/usb/if_upgt.c +++ b/sys/dev/usb/if_upgt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_upgt.c,v 1.55 2011/01/25 20:03:35 jakemsr Exp $ */ +/* $OpenBSD: if_upgt.c,v 1.56 2011/07/03 15:47:17 matthew Exp $ */ /* * Copyright (c) 2007 Marcus Glocker <mglocker@openbsd.org> @@ -511,8 +511,6 @@ upgt_activate(struct device *self, int act) struct upgt_softc *sc = (struct upgt_softc *)self; switch (act) { - case DVACT_ACTIVATE: - break; case DVACT_DEACTIVATE: usbd_deactivate(sc->sc_udev); break; diff --git a/sys/dev/usb/if_upl.c b/sys/dev/usb/if_upl.c index 25ac4c92ac1..29afec72365 100644 --- a/sys/dev/usb/if_upl.c +++ b/sys/dev/usb/if_upl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_upl.c,v 1.47 2011/01/25 20:03:35 jakemsr Exp $ */ +/* $OpenBSD: if_upl.c,v 1.48 2011/07/03 15:47:17 matthew Exp $ */ /* $NetBSD: if_upl.c,v 1.19 2002/07/11 21:14:26 augustss Exp $ */ /* * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -346,9 +346,6 @@ upl_activate(struct device *self, int act) DPRINTFN(2,("%s: %s: enter\n", sc->sc_dev.dv_xname, __func__)); switch (act) { - case DVACT_ACTIVATE: - break; - case DVACT_DEACTIVATE: sc->sc_dying = 1; break; diff --git a/sys/dev/usb/if_url.c b/sys/dev/usb/if_url.c index 3f57d55a65b..3a21c8b7aa5 100644 --- a/sys/dev/usb/if_url.c +++ b/sys/dev/usb/if_url.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_url.c,v 1.62 2011/06/23 16:31:16 deraadt Exp $ */ +/* $OpenBSD: if_url.c,v 1.63 2011/07/03 15:47:17 matthew Exp $ */ /* $NetBSD: if_url.c,v 1.6 2002/09/29 10:19:21 martin Exp $ */ /* * Copyright (c) 2001, 2002 @@ -587,9 +587,6 @@ url_activate(struct device *self, int act) __func__, act)); switch (act) { - case DVACT_ACTIVATE: - break; - case DVACT_DEACTIVATE: usbd_deactivate(sc->sc_udev); break; diff --git a/sys/dev/usb/if_urndis.c b/sys/dev/usb/if_urndis.c index fa585550335..6c2faa00b61 100644 --- a/sys/dev/usb/if_urndis.c +++ b/sys/dev/usb/if_urndis.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_urndis.c,v 1.30 2011/05/05 17:00:43 sthen Exp $ */ +/* $OpenBSD: if_urndis.c,v 1.31 2011/07/03 15:47:17 matthew Exp $ */ /* * Copyright (c) 2010 Jonathan Armani <armani@openbsd.org> @@ -1552,9 +1552,6 @@ urndis_activate(struct device *self, int devact) sc = (struct urndis_softc *)self; switch (devact) { - case DVACT_ACTIVATE: - break; - case DVACT_DEACTIVATE: sc->sc_dying = 1; break; diff --git a/sys/dev/usb/if_urtw.c b/sys/dev/usb/if_urtw.c index 8a3834cb220..ea7cdaa6bd4 100644 --- a/sys/dev/usb/if_urtw.c +++ b/sys/dev/usb/if_urtw.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_urtw.c,v 1.38 2011/01/25 20:03:35 jakemsr Exp $ */ +/* $OpenBSD: if_urtw.c,v 1.39 2011/07/03 15:47:17 matthew Exp $ */ /*- * Copyright (c) 2009 Martynas Venckus <martynas@openbsd.org> @@ -803,8 +803,6 @@ urtw_activate(struct device *self, int act) struct urtw_softc *sc = (struct urtw_softc *)self; switch (act) { - case DVACT_ACTIVATE: - break; case DVACT_DEACTIVATE: usbd_deactivate(sc->sc_udev); break; diff --git a/sys/dev/usb/if_urtwn.c b/sys/dev/usb/if_urtwn.c index 302e6c28104..ebff3d82855 100644 --- a/sys/dev/usb/if_urtwn.c +++ b/sys/dev/usb/if_urtwn.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_urtwn.c,v 1.17 2011/06/19 17:55:37 jsg Exp $ */ +/* $OpenBSD: if_urtwn.c,v 1.18 2011/07/03 15:47:17 matthew Exp $ */ /*- * Copyright (c) 2010 Damien Bergamini <damien.bergamini@free.fr> @@ -403,8 +403,6 @@ urtwn_activate(struct device *self, int act) struct urtwn_softc *sc = (struct urtwn_softc *)self; switch (act) { - case DVACT_ACTIVATE: - break; case DVACT_DEACTIVATE: usbd_deactivate(sc->sc_udev); break; diff --git a/sys/dev/usb/if_wi_usb.c b/sys/dev/usb/if_wi_usb.c index ac2f483947a..bd62c1431f9 100644 --- a/sys/dev/usb/if_wi_usb.c +++ b/sys/dev/usb/if_wi_usb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_wi_usb.c,v 1.52 2011/06/22 16:44:29 tedu Exp $ */ +/* $OpenBSD: if_wi_usb.c,v 1.53 2011/07/03 15:47:17 matthew Exp $ */ /* * Copyright (c) 2003 Dale Rahn. All rights reserved. @@ -1338,9 +1338,6 @@ wi_usb_activate(struct device *self, int act) DPRINTFN(10,("%s: %s: enter\n", sc->wi_usb_dev.dv_xname, __func__)); switch (act) { - case DVACT_ACTIVATE: - break; - case DVACT_DEACTIVATE: sc->wi_usb_dying = 1; sc->wi_thread_info->dying = 1; diff --git a/sys/dev/usb/if_zyd.c b/sys/dev/usb/if_zyd.c index 5312b8bbee6..52fcaf96bc0 100644 --- a/sys/dev/usb/if_zyd.c +++ b/sys/dev/usb/if_zyd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_zyd.c,v 1.87 2011/01/25 20:03:36 jakemsr Exp $ */ +/* $OpenBSD: if_zyd.c,v 1.88 2011/07/03 15:47:17 matthew Exp $ */ /*- * Copyright (c) 2006 by Damien Bergamini <damien.bergamini@free.fr> @@ -2585,9 +2585,6 @@ zyd_activate(struct device *self, int act) struct zyd_softc *sc = (struct zyd_softc *)self; switch (act) { - case DVACT_ACTIVATE: - break; - case DVACT_DEACTIVATE: usbd_deactivate(sc->sc_udev); break; diff --git a/sys/dev/usb/moscom.c b/sys/dev/usb/moscom.c index c646c4a6331..b6fca780819 100644 --- a/sys/dev/usb/moscom.c +++ b/sys/dev/usb/moscom.c @@ -1,4 +1,4 @@ -/* $OpenBSD: moscom.c,v 1.15 2011/01/25 20:03:36 jakemsr Exp $ */ +/* $OpenBSD: moscom.c,v 1.16 2011/07/03 15:47:17 matthew Exp $ */ /* * Copyright (c) 2006 Jonathan Gray <jsg@openbsd.org> @@ -285,9 +285,6 @@ moscom_activate(struct device *self, int act) int rv = 0; switch (act) { - case DVACT_ACTIVATE: - break; - case DVACT_DEACTIVATE: if (sc->sc_subdev != NULL) rv = config_deactivate(sc->sc_subdev); diff --git a/sys/dev/usb/ohci.c b/sys/dev/usb/ohci.c index d90d7901d6d..6b19277a027 100644 --- a/sys/dev/usb/ohci.c +++ b/sys/dev/usb/ohci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ohci.c,v 1.103 2010/12/14 16:13:16 jakemsr Exp $ */ +/* $OpenBSD: ohci.c,v 1.104 2011/07/03 15:47:17 matthew Exp $ */ /* $NetBSD: ohci.c,v 1.139 2003/02/22 05:24:16 tsutsui Exp $ */ /* $FreeBSD: src/sys/dev/usb/ohci.c,v 1.22 1999/11/17 22:33:40 n_hibma Exp $ */ @@ -331,8 +331,6 @@ ohci_activate(struct device *self, int act) int rv = 0; switch (act) { - case DVACT_ACTIVATE: - break; case DVACT_SUSPEND: sc->sc_bus.use_polling++; reg = OREAD4(sc, OHCI_CONTROL) & ~OHCI_HCFS_MASK; diff --git a/sys/dev/usb/uark.c b/sys/dev/usb/uark.c index fd21138a97d..38b14b39781 100644 --- a/sys/dev/usb/uark.c +++ b/sys/dev/usb/uark.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uark.c,v 1.15 2011/01/25 20:03:36 jakemsr Exp $ */ +/* $OpenBSD: uark.c,v 1.16 2011/07/03 15:47:17 matthew Exp $ */ /* * Copyright (c) 2006 Jonathan Gray <jsg@openbsd.org> @@ -212,9 +212,6 @@ uark_activate(struct device *self, int act) int rv = 0; switch (act) { - case DVACT_ACTIVATE: - break; - case DVACT_DEACTIVATE: if (sc->sc_subdev != NULL) rv = config_deactivate(sc->sc_subdev); diff --git a/sys/dev/usb/uaudio.c b/sys/dev/usb/uaudio.c index 439fc248543..e6da3039f99 100644 --- a/sys/dev/usb/uaudio.c +++ b/sys/dev/usb/uaudio.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uaudio.c,v 1.91 2011/01/25 20:03:36 jakemsr Exp $ */ +/* $OpenBSD: uaudio.c,v 1.92 2011/07/03 15:47:17 matthew Exp $ */ /* $NetBSD: uaudio.c,v 1.90 2004/10/29 17:12:53 kent Exp $ */ /* @@ -571,8 +571,6 @@ uaudio_activate(struct device *self, int act) int rv = 0; switch (act) { - case DVACT_ACTIVATE: - break; case DVACT_DEACTIVATE: if (sc->sc_audiodev != NULL) rv = config_deactivate(sc->sc_audiodev); diff --git a/sys/dev/usb/uberry.c b/sys/dev/usb/uberry.c index 5e2a9a917b5..5b2bd018b38 100644 --- a/sys/dev/usb/uberry.c +++ b/sys/dev/usb/uberry.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uberry.c,v 1.19 2011/01/25 20:03:36 jakemsr Exp $ */ +/* $OpenBSD: uberry.c,v 1.20 2011/07/03 15:47:17 matthew Exp $ */ /*- * Copyright (c) 2006 Theo de Raadt <deraadt@openbsd.org> @@ -156,9 +156,6 @@ uberry_activate(struct device *self, int act) struct uberry_softc *sc = (struct uberry_softc *)self; switch (act) { - case DVACT_ACTIVATE: - break; - case DVACT_DEACTIVATE: usbd_deactivate(sc->sc_udev); break; diff --git a/sys/dev/usb/ubsa.c b/sys/dev/usb/ubsa.c index a6b796ea4da..91d38404171 100644 --- a/sys/dev/usb/ubsa.c +++ b/sys/dev/usb/ubsa.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ubsa.c,v 1.52 2011/01/25 20:03:36 jakemsr Exp $ */ +/* $OpenBSD: ubsa.c,v 1.53 2011/07/03 15:47:17 matthew Exp $ */ /* $NetBSD: ubsa.c,v 1.5 2002/11/25 00:51:33 fvdl Exp $ */ /*- * Copyright (c) 2002, Alexander Kabaev <kan.FreeBSD.org>. @@ -405,9 +405,6 @@ ubsa_activate(struct device *self, int act) int rv = 0; switch (act) { - case DVACT_ACTIVATE: - break; - case DVACT_DEACTIVATE: if (sc->sc_subdev != NULL) rv = config_deactivate(sc->sc_subdev); diff --git a/sys/dev/usb/ubt.c b/sys/dev/usb/ubt.c index 6212a3556ad..a29d17dc65e 100644 --- a/sys/dev/usb/ubt.c +++ b/sys/dev/usb/ubt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ubt.c,v 1.20 2011/01/25 20:03:36 jakemsr Exp $ */ +/* $OpenBSD: ubt.c,v 1.21 2011/07/03 15:47:17 matthew Exp $ */ /* $NetBSD: ubt.c,v 1.35 2008/07/28 14:19:26 drochner Exp $ */ /*- @@ -493,8 +493,6 @@ ubt_activate(struct device *self, int act) struct ubt_softc *sc = (struct ubt_softc *)self; switch (act) { - case DVACT_ACTIVATE: - break; case DVACT_DEACTIVATE: sc->sc_dying = 1; break; diff --git a/sys/dev/usb/uchcom.c b/sys/dev/usb/uchcom.c index 10bdadf5c6f..3bacf17c553 100644 --- a/sys/dev/usb/uchcom.c +++ b/sys/dev/usb/uchcom.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uchcom.c,v 1.14 2011/01/25 20:03:36 jakemsr Exp $ */ +/* $OpenBSD: uchcom.c,v 1.15 2011/07/03 15:47:17 matthew Exp $ */ /* $NetBSD: uchcom.c,v 1.1 2007/09/03 17:57:37 tshiozak Exp $ */ /* @@ -337,8 +337,6 @@ uchcom_activate(struct device *self, int act) int rv = 0; switch (act) { - case DVACT_ACTIVATE: - break; case DVACT_DEACTIVATE: uchcom_close_intr_pipe(sc); sc->sc_dying = 1; diff --git a/sys/dev/usb/ucom.c b/sys/dev/usb/ucom.c index 15fccf18527..6d02d518e79 100644 --- a/sys/dev/usb/ucom.c +++ b/sys/dev/usb/ucom.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ucom.c,v 1.52 2011/06/23 16:02:33 tedu Exp $ */ +/* $OpenBSD: ucom.c,v 1.53 2011/07/03 15:47:17 matthew Exp $ */ /* $NetBSD: ucom.c,v 1.49 2003/01/01 00:10:25 thorpej Exp $ */ /* @@ -271,9 +271,6 @@ ucom_activate(struct device *self, int act) DPRINTFN(5,("ucom_activate: %d\n", act)); switch (act) { - case DVACT_ACTIVATE: - break; - case DVACT_DEACTIVATE: sc->sc_dying = 1; break; diff --git a/sys/dev/usb/ucycom.c b/sys/dev/usb/ucycom.c index 025dfab5caa..ca807d9dd96 100644 --- a/sys/dev/usb/ucycom.c +++ b/sys/dev/usb/ucycom.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ucycom.c,v 1.19 2011/01/25 20:03:36 jakemsr Exp $ */ +/* $OpenBSD: ucycom.c,v 1.20 2011/07/03 15:47:17 matthew Exp $ */ /* $NetBSD: ucycom.c,v 1.3 2005/08/05 07:27:47 skrll Exp $ */ /* @@ -596,9 +596,6 @@ ucycom_activate(struct device *self, int act) DPRINTFN(5,("ucycom_activate: %d\n", act)); switch (act) { - case DVACT_ACTIVATE: - break; - case DVACT_DEACTIVATE: if (sc->sc_subdev != NULL) rv = config_deactivate(sc->sc_subdev); diff --git a/sys/dev/usb/udcf.c b/sys/dev/usb/udcf.c index d4b04048916..0f1d4ff6d5c 100644 --- a/sys/dev/usb/udcf.c +++ b/sys/dev/usb/udcf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: udcf.c,v 1.53 2011/01/25 20:03:36 jakemsr Exp $ */ +/* $OpenBSD: udcf.c,v 1.54 2011/07/03 15:47:17 matthew Exp $ */ /* * Copyright (c) 2006, 2007, 2008 Marc Balmer <mbalmer@openbsd.org> @@ -801,8 +801,6 @@ udcf_activate(struct device *self, int act) struct udcf_softc *sc = (struct udcf_softc *)self; switch (act) { - case DVACT_ACTIVATE: - break; case DVACT_DEACTIVATE: usbd_deactivate(sc->sc_udev); break; diff --git a/sys/dev/usb/udfu.c b/sys/dev/usb/udfu.c index 563045d3d49..fc5b74f5d65 100644 --- a/sys/dev/usb/udfu.c +++ b/sys/dev/usb/udfu.c @@ -1,4 +1,4 @@ -/* $OpenBSD: udfu.c,v 1.3 2011/01/25 20:03:36 jakemsr Exp $ */ +/* $OpenBSD: udfu.c,v 1.4 2011/07/03 15:47:17 matthew Exp $ */ /* * Copyright (c) 2009 Federico G. Schwindt <fgsch@openbsd.org> @@ -170,9 +170,6 @@ udfu_activate(struct device *self, int act) struct udfu_softc *sc = (struct udfu_softc *)self; switch (act) { - case DVACT_ACTIVATE: - break; - case DVACT_DEACTIVATE: usbd_deactivate(sc->sc_udev); break; diff --git a/sys/dev/usb/udl.c b/sys/dev/usb/udl.c index 7fec77332f2..61b7a4d15fb 100644 --- a/sys/dev/usb/udl.c +++ b/sys/dev/usb/udl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: udl.c,v 1.67 2011/01/25 20:03:36 jakemsr Exp $ */ +/* $OpenBSD: udl.c,v 1.68 2011/07/03 15:47:17 matthew Exp $ */ /* * Copyright (c) 2009 Marcus Glocker <mglocker@openbsd.org> @@ -486,8 +486,6 @@ udl_activate(struct device *self, int act) struct udl_softc *sc = (struct udl_softc *)self; switch (act) { - case DVACT_ACTIVATE: - break; case DVACT_DEACTIVATE: usbd_deactivate(sc->sc_udev); break; diff --git a/sys/dev/usb/udsbr.c b/sys/dev/usb/udsbr.c index a3b9e2084c6..02fdb98a41a 100644 --- a/sys/dev/usb/udsbr.c +++ b/sys/dev/usb/udsbr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: udsbr.c,v 1.22 2011/01/25 20:03:36 jakemsr Exp $ */ +/* $OpenBSD: udsbr.c,v 1.23 2011/07/03 15:47:17 matthew Exp $ */ /* $NetBSD: udsbr.c,v 1.7 2002/07/11 21:14:27 augustss Exp $ */ /* @@ -169,9 +169,6 @@ udsbr_activate(struct device *self, int act) int rv = 0; switch (act) { - case DVACT_ACTIVATE: - break; - case DVACT_DEACTIVATE: sc->sc_dying = 1; if (sc->sc_child != NULL) diff --git a/sys/dev/usb/ueagle.c b/sys/dev/usb/ueagle.c index 592a5166869..73c33ba5139 100644 --- a/sys/dev/usb/ueagle.c +++ b/sys/dev/usb/ueagle.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ueagle.c,v 1.33 2011/03/22 16:31:19 deraadt Exp $ */ +/* $OpenBSD: ueagle.c,v 1.34 2011/07/03 15:47:17 matthew Exp $ */ /*- * Copyright (c) 2003-2006 @@ -1461,9 +1461,6 @@ ueagle_activate(struct device *self, int act) struct ueagle_softc *sc = (struct ueagle_softc *)self; switch (act) { - case DVACT_ACTIVATE: - break; - case DVACT_DEACTIVATE: usbd_deactivate(sc->sc_udev); break; diff --git a/sys/dev/usb/uftdi.c b/sys/dev/usb/uftdi.c index 891cfcd54ad..27a455ae2e2 100644 --- a/sys/dev/usb/uftdi.c +++ b/sys/dev/usb/uftdi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uftdi.c,v 1.58 2011/01/25 20:03:36 jakemsr Exp $ */ +/* $OpenBSD: uftdi.c,v 1.59 2011/07/03 15:47:17 matthew Exp $ */ /* $NetBSD: uftdi.c,v 1.14 2003/02/23 04:20:07 simonb Exp $ */ /* @@ -891,9 +891,6 @@ uftdi_activate(struct device *self, int act) int rv = 0; switch (act) { - case DVACT_ACTIVATE: - break; - case DVACT_DEACTIVATE: if (sc->sc_subdev != NULL) rv = config_deactivate(sc->sc_subdev); diff --git a/sys/dev/usb/ugen.c b/sys/dev/usb/ugen.c index 8ed3dd5610b..d042e4526fc 100644 --- a/sys/dev/usb/ugen.c +++ b/sys/dev/usb/ugen.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ugen.c,v 1.65 2011/07/02 22:20:08 nicm Exp $ */ +/* $OpenBSD: ugen.c,v 1.66 2011/07/03 15:47:17 matthew Exp $ */ /* $NetBSD: ugen.c,v 1.63 2002/11/26 18:49:48 christos Exp $ */ /* $FreeBSD: src/sys/dev/usb/ugen.c,v 1.26 1999/11/17 22:33:41 n_hibma Exp $ */ @@ -746,9 +746,6 @@ ugen_activate(struct device *self, int act) struct ugen_softc *sc = (struct ugen_softc *)self; switch (act) { - case DVACT_ACTIVATE: - break; - case DVACT_DEACTIVATE: sc->sc_dying = 1; break; diff --git a/sys/dev/usb/uhci.c b/sys/dev/usb/uhci.c index 4b9952e27ed..2601b65b84e 100644 --- a/sys/dev/usb/uhci.c +++ b/sys/dev/usb/uhci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uhci.c,v 1.89 2010/12/14 16:13:16 jakemsr Exp $ */ +/* $OpenBSD: uhci.c,v 1.90 2011/07/03 15:47:17 matthew Exp $ */ /* $NetBSD: uhci.c,v 1.172 2003/02/23 04:19:26 simonb Exp $ */ /* $FreeBSD: src/sys/dev/usb/uhci.c,v 1.33 1999/11/17 22:33:41 n_hibma Exp $ */ @@ -525,8 +525,6 @@ uhci_activate(struct device *self, int act) int cmd, rv = 0; switch (act) { - case DVACT_ACTIVATE: - break; case DVACT_SUSPEND: #ifdef UHCI_DEBUG if (uhcidebug > 2) diff --git a/sys/dev/usb/uhid.c b/sys/dev/usb/uhid.c index 0a4393f9e5a..31d8e9f18dd 100644 --- a/sys/dev/usb/uhid.c +++ b/sys/dev/usb/uhid.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uhid.c,v 1.52 2011/07/02 22:20:08 nicm Exp $ */ +/* $OpenBSD: uhid.c,v 1.53 2011/07/03 15:47:17 matthew Exp $ */ /* $NetBSD: uhid.c,v 1.57 2003/03/11 16:44:00 augustss Exp $ */ /* @@ -156,9 +156,6 @@ uhid_activate(struct device *self, int act) struct uhid_softc *sc = (struct uhid_softc *)self; switch (act) { - case DVACT_ACTIVATE: - break; - case DVACT_DEACTIVATE: sc->sc_dying = 1; break; diff --git a/sys/dev/usb/uhidev.c b/sys/dev/usb/uhidev.c index 20b86017730..c43b67fe4f8 100644 --- a/sys/dev/usb/uhidev.c +++ b/sys/dev/usb/uhidev.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uhidev.c,v 1.41 2011/01/25 20:03:36 jakemsr Exp $ */ +/* $OpenBSD: uhidev.c,v 1.42 2011/07/03 15:47:17 matthew Exp $ */ /* $NetBSD: uhidev.c,v 1.14 2003/03/11 16:44:00 augustss Exp $ */ /* @@ -336,8 +336,6 @@ uhidev_activate(struct device *self, int act) int i, rv = 0, r; switch (act) { - case DVACT_ACTIVATE: - break; case DVACT_DEACTIVATE: for (i = 0; i < sc->sc_nrepid; i++) if (sc->sc_subdevs[i] != NULL) { diff --git a/sys/dev/usb/uhts.c b/sys/dev/usb/uhts.c index c38c56f56b4..a01ccc21d3a 100644 --- a/sys/dev/usb/uhts.c +++ b/sys/dev/usb/uhts.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uhts.c,v 1.3 2011/04/07 15:30:16 miod Exp $ */ +/* $OpenBSD: uhts.c,v 1.4 2011/07/03 15:47:17 matthew Exp $ */ /* * Copyright (c) 2009 Matthieu Herrb <matthieu@herrb.eu> * Copyright (c) 2007 Robert Nagy <robert@openbsd.org> @@ -238,8 +238,6 @@ uhts_activate(struct device *self, int act) int rv = 0; switch (act) { - case DVACT_ACTIVATE: - break; case DVACT_DEACTIVATE: if (sc->sc_wsmousedev != NULL) rv = config_deactivate(sc->sc_wsmousedev); diff --git a/sys/dev/usb/uhub.c b/sys/dev/usb/uhub.c index bd20aeb8cc5..0da6613206f 100644 --- a/sys/dev/usb/uhub.c +++ b/sys/dev/usb/uhub.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uhub.c,v 1.57 2011/01/25 20:03:36 jakemsr Exp $ */ +/* $OpenBSD: uhub.c,v 1.58 2011/07/03 15:47:17 matthew Exp $ */ /* $NetBSD: uhub.c,v 1.64 2003/02/08 03:32:51 ichiro Exp $ */ /* $FreeBSD: src/sys/dev/usb/uhub.c,v 1.18 1999/11/17 22:33:43 n_hibma Exp $ */ @@ -523,9 +523,6 @@ uhub_activate(struct device *self, int act) int nports, port, i; switch (act) { - case DVACT_ACTIVATE: - break; - case DVACT_DEACTIVATE: if (hub == NULL) /* malfunctioning hub */ break; diff --git a/sys/dev/usb/uipaq.c b/sys/dev/usb/uipaq.c index 385cd616856..be18e7a0d4b 100644 --- a/sys/dev/usb/uipaq.c +++ b/sys/dev/usb/uipaq.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uipaq.c,v 1.19 2011/01/25 20:03:36 jakemsr Exp $ */ +/* $OpenBSD: uipaq.c,v 1.20 2011/07/03 15:47:17 matthew Exp $ */ /* * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -361,9 +361,6 @@ uipaq_activate(struct device *self, int act) int rv = 0; switch (act) { - case DVACT_ACTIVATE: - break; - case DVACT_DEACTIVATE: if (sc->sc_subdev != NULL) rv = config_deactivate(sc->sc_subdev); diff --git a/sys/dev/usb/ukbd.c b/sys/dev/usb/ukbd.c index d71ac3a6c70..1fffac497bb 100644 --- a/sys/dev/usb/ukbd.c +++ b/sys/dev/usb/ukbd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ukbd.c,v 1.54 2010/08/29 15:28:11 miod Exp $ */ +/* $OpenBSD: ukbd.c,v 1.55 2011/07/03 15:47:17 matthew Exp $ */ /* $NetBSD: ukbd.c,v 1.85 2003/03/11 16:44:00 augustss Exp $ */ /* @@ -281,9 +281,6 @@ ukbd_activate(struct device *self, int act) int rv = 0; switch (act) { - case DVACT_ACTIVATE: - break; - case DVACT_DEACTIVATE: if (kbd->sc_wskbddev != NULL) rv = config_deactivate(kbd->sc_wskbddev); diff --git a/sys/dev/usb/ulpt.c b/sys/dev/usb/ulpt.c index aa9d81c11e3..1dfa1951e85 100644 --- a/sys/dev/usb/ulpt.c +++ b/sys/dev/usb/ulpt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ulpt.c,v 1.38 2011/01/25 20:03:36 jakemsr Exp $ */ +/* $OpenBSD: ulpt.c,v 1.39 2011/07/03 15:47:17 matthew Exp $ */ /* $NetBSD: ulpt.c,v 1.57 2003/01/05 10:19:42 scw Exp $ */ /* $FreeBSD: src/sys/dev/usb/ulpt.c,v 1.24 1999/11/17 22:33:44 n_hibma Exp $ */ @@ -306,9 +306,6 @@ ulpt_activate(struct device *self, int act) struct ulpt_softc *sc = (struct ulpt_softc *)self; switch (act) { - case DVACT_ACTIVATE: - break; - case DVACT_DEACTIVATE: sc->sc_dying = 1; break; diff --git a/sys/dev/usb/umass.c b/sys/dev/usb/umass.c index e1bece5b2f5..2e01138267d 100644 --- a/sys/dev/usb/umass.c +++ b/sys/dev/usb/umass.c @@ -1,4 +1,4 @@ -/* $OpenBSD: umass.c,v 1.61 2011/05/24 20:27:11 matthew Exp $ */ +/* $OpenBSD: umass.c,v 1.62 2011/07/03 15:47:17 matthew Exp $ */ /* $NetBSD: umass.c,v 1.116 2004/06/30 05:53:46 mycroft Exp $ */ /* @@ -679,9 +679,6 @@ umass_activate(struct device *dev, int act) sc->sc_dev.dv_xname, act)); switch (act) { - case DVACT_ACTIVATE: - break; - case DVACT_DEACTIVATE: sc->sc_dying = 1; if (scbus == NULL || scbus->sc_child == NULL) diff --git a/sys/dev/usb/umbg.c b/sys/dev/usb/umbg.c index 7ef0726ef7d..bea02ce9709 100644 --- a/sys/dev/usb/umbg.c +++ b/sys/dev/usb/umbg.c @@ -1,4 +1,4 @@ -/* $OpenBSD: umbg.c,v 1.16 2011/01/25 20:03:36 jakemsr Exp $ */ +/* $OpenBSD: umbg.c,v 1.17 2011/07/03 15:47:17 matthew Exp $ */ /* * Copyright (c) 2007 Marc Balmer <mbalmer@openbsd.org> @@ -453,8 +453,6 @@ umbg_activate(struct device *self, int act) struct umbg_softc *sc = (struct umbg_softc *)self; switch (act) { - case DVACT_ACTIVATE: - break; case DVACT_DEACTIVATE: usbd_deactivate(sc->sc_udev); break; diff --git a/sys/dev/usb/umct.c b/sys/dev/usb/umct.c index aaec7505ad0..9ede748857f 100644 --- a/sys/dev/usb/umct.c +++ b/sys/dev/usb/umct.c @@ -1,4 +1,4 @@ -/* $OpenBSD: umct.c,v 1.32 2011/01/25 20:03:36 jakemsr Exp $ */ +/* $OpenBSD: umct.c,v 1.33 2011/07/03 15:47:17 matthew Exp $ */ /* $NetBSD: umct.c,v 1.10 2003/02/23 04:20:07 simonb Exp $ */ /* * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -338,9 +338,6 @@ umct_activate(struct device *self, int act) int rv = 0; switch (act) { - case DVACT_ACTIVATE: - break; - case DVACT_DEACTIVATE: if (sc->sc_subdev != NULL) rv = config_deactivate(sc->sc_subdev); diff --git a/sys/dev/usb/umidi.c b/sys/dev/usb/umidi.c index eaebdf36ec3..c2c4fb0f7a4 100644 --- a/sys/dev/usb/umidi.c +++ b/sys/dev/usb/umidi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: umidi.c,v 1.31 2011/06/23 23:04:28 oga Exp $ */ +/* $OpenBSD: umidi.c,v 1.32 2011/07/03 15:47:17 matthew Exp $ */ /* $NetBSD: umidi.c,v 1.16 2002/07/11 21:14:32 augustss Exp $ */ /* * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -234,9 +234,6 @@ umidi_activate(struct device *self, int act) struct umidi_softc *sc = (struct umidi_softc *)self; switch (act) { - case DVACT_ACTIVATE: - DPRINTFN(1,("umidi_activate (activate)\n")); - break; case DVACT_DEACTIVATE: DPRINTFN(1,("umidi_activate (deactivate)\n")); sc->sc_dying = 1; diff --git a/sys/dev/usb/umodem.c b/sys/dev/usb/umodem.c index 49abeedaeda..0fc7bfee213 100644 --- a/sys/dev/usb/umodem.c +++ b/sys/dev/usb/umodem.c @@ -1,4 +1,4 @@ -/* $OpenBSD: umodem.c,v 1.43 2011/03/22 16:31:19 deraadt Exp $ */ +/* $OpenBSD: umodem.c,v 1.44 2011/07/03 15:47:17 matthew Exp $ */ /* $NetBSD: umodem.c,v 1.45 2002/09/23 05:51:23 simonb Exp $ */ /* @@ -743,9 +743,6 @@ umodem_activate(struct device *self, int act) int rv = 0; switch (act) { - case DVACT_ACTIVATE: - break; - case DVACT_DEACTIVATE: sc->sc_dying = 1; if (sc->sc_subdev) diff --git a/sys/dev/usb/ums.c b/sys/dev/usb/ums.c index 354b1bc2694..3bb0b545863 100644 --- a/sys/dev/usb/ums.c +++ b/sys/dev/usb/ums.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ums.c,v 1.34 2011/03/04 23:57:52 kettenis Exp $ */ +/* $OpenBSD: ums.c,v 1.35 2011/07/03 15:47:17 matthew Exp $ */ /* $NetBSD: ums.c,v 1.60 2003/03/11 16:44:00 augustss Exp $ */ /* @@ -163,9 +163,6 @@ ums_activate(struct device *self, int act) int rv = 0; switch (act) { - case DVACT_ACTIVATE: - break; - case DVACT_DEACTIVATE: if (ms->sc_wsmousedev != NULL) rv = config_deactivate(ms->sc_wsmousedev); diff --git a/sys/dev/usb/umsm.c b/sys/dev/usb/umsm.c index dc15f38e0eb..6426119405a 100644 --- a/sys/dev/usb/umsm.c +++ b/sys/dev/usb/umsm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: umsm.c,v 1.75 2011/06/15 14:02:10 jsg Exp $ */ +/* $OpenBSD: umsm.c,v 1.76 2011/07/03 15:47:17 matthew Exp $ */ /* * Copyright (c) 2008 Yojiro UO <yuo@nui.org> @@ -425,9 +425,6 @@ umsm_activate(struct device *self, int act) int rv = 0; switch (act) { - case DVACT_ACTIVATE: - break; - case DVACT_DEACTIVATE: if (sc->sc_subdev != NULL) rv = config_deactivate(sc->sc_subdev); diff --git a/sys/dev/usb/uow.c b/sys/dev/usb/uow.c index 73c5942345a..c539d708833 100644 --- a/sys/dev/usb/uow.c +++ b/sys/dev/usb/uow.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uow.c,v 1.29 2011/01/25 20:03:36 jakemsr Exp $ */ +/* $OpenBSD: uow.c,v 1.30 2011/07/03 15:47:17 matthew Exp $ */ /* * Copyright (c) 2006 Alexander Yurchenko <grange@openbsd.org> @@ -270,8 +270,6 @@ uow_activate(struct device *self, int act) int rv = 0; switch (act) { - case DVACT_ACTIVATE: - break; case DVACT_DEACTIVATE: if (sc->sc_ow_dev != NULL) rv = config_deactivate(sc->sc_ow_dev); diff --git a/sys/dev/usb/uplcom.c b/sys/dev/usb/uplcom.c index 65a4c374165..e1a1de762ef 100644 --- a/sys/dev/usb/uplcom.c +++ b/sys/dev/usb/uplcom.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uplcom.c,v 1.55 2011/01/25 20:03:36 jakemsr Exp $ */ +/* $OpenBSD: uplcom.c,v 1.56 2011/07/03 15:47:17 matthew Exp $ */ /* $NetBSD: uplcom.c,v 1.29 2002/09/23 05:51:23 simonb Exp $ */ /* * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -445,9 +445,6 @@ uplcom_activate(struct device *self, int act) int rv = 0; switch (act) { - case DVACT_ACTIVATE: - break; - case DVACT_DEACTIVATE: if (sc->sc_subdev != NULL) rv = config_deactivate(sc->sc_subdev); diff --git a/sys/dev/usb/urio.c b/sys/dev/usb/urio.c index 76442fefe5d..ce155984ce9 100644 --- a/sys/dev/usb/urio.c +++ b/sys/dev/usb/urio.c @@ -1,4 +1,4 @@ -/* $OpenBSD: urio.c,v 1.38 2011/01/25 20:03:36 jakemsr Exp $ */ +/* $OpenBSD: urio.c,v 1.39 2011/07/03 15:47:17 matthew Exp $ */ /* $NetBSD: urio.c,v 1.15 2002/10/23 09:14:02 jdolecek Exp $ */ /* @@ -231,9 +231,6 @@ urio_activate(struct device *self, int act) struct urio_softc *sc = (struct urio_softc *)self; switch (act) { - case DVACT_ACTIVATE: - break; - case DVACT_DEACTIVATE: sc->sc_dying = 1; break; diff --git a/sys/dev/usb/usb.c b/sys/dev/usb/usb.c index 07539c46ec7..ce40062aad5 100644 --- a/sys/dev/usb/usb.c +++ b/sys/dev/usb/usb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: usb.c,v 1.76 2011/04/28 07:35:15 jakemsr Exp $ */ +/* $OpenBSD: usb.c,v 1.77 2011/07/03 15:47:17 matthew Exp $ */ /* $NetBSD: usb.c,v 1.77 2003/01/01 00:10:26 thorpej Exp $ */ /* @@ -757,8 +757,6 @@ usb_activate(struct device *self, int act) int i, rv = 0, r; switch (act) { - case DVACT_ACTIVATE: - break; case DVACT_DEACTIVATE: sc->sc_bus->dying = 1; if (dev != NULL && dev->cdesc != NULL && diff --git a/sys/dev/usb/uscanner.c b/sys/dev/usb/uscanner.c index 59c39033957..c28fdaeb943 100644 --- a/sys/dev/usb/uscanner.c +++ b/sys/dev/usb/uscanner.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uscanner.c,v 1.45 2011/07/02 22:20:08 nicm Exp $ */ +/* $OpenBSD: uscanner.c,v 1.46 2011/07/03 15:47:17 matthew Exp $ */ /* $NetBSD: uscanner.c,v 1.40 2003/01/27 00:32:44 wiz Exp $ */ /* @@ -559,9 +559,6 @@ uscanner_activate(struct device *self, int act) struct uscanner_softc *sc = (struct uscanner_softc *)self; switch (act) { - case DVACT_ACTIVATE: - break; - case DVACT_DEACTIVATE: sc->sc_dying = 1; break; diff --git a/sys/dev/usb/uslcom.c b/sys/dev/usb/uslcom.c index 225b4b75a61..7136167aa9a 100644 --- a/sys/dev/usb/uslcom.c +++ b/sys/dev/usb/uslcom.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uslcom.c,v 1.22 2011/01/25 20:03:36 jakemsr Exp $ */ +/* $OpenBSD: uslcom.c,v 1.23 2011/07/03 15:47:17 matthew Exp $ */ /* * Copyright (c) 2006 Jonathan Gray <jsg@openbsd.org> @@ -265,9 +265,6 @@ uslcom_activate(struct device *self, int act) int rv = 0; switch (act) { - case DVACT_ACTIVATE: - break; - case DVACT_DEACTIVATE: if (sc->sc_subdev != NULL) rv = config_deactivate(sc->sc_subdev); diff --git a/sys/dev/usb/uthum.c b/sys/dev/usb/uthum.c index 5e19752905e..c48a92eebb8 100644 --- a/sys/dev/usb/uthum.c +++ b/sys/dev/usb/uthum.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uthum.c,v 1.16 2011/01/25 20:03:36 jakemsr Exp $ */ +/* $OpenBSD: uthum.c,v 1.17 2011/07/03 15:47:17 matthew Exp $ */ /* * Copyright (c) 2009, 2010 Yojiro UO <yuo@nui.org> @@ -289,9 +289,6 @@ uthum_activate(struct device *self, int act) struct uthum_softc *sc = (struct uthum_softc *)self; switch (act) { - case DVACT_ACTIVATE: - break; - case DVACT_DEACTIVATE: sc->sc_dying = 1; break; diff --git a/sys/dev/usb/uticom.c b/sys/dev/usb/uticom.c index d47312415a8..a12967cffcc 100644 --- a/sys/dev/usb/uticom.c +++ b/sys/dev/usb/uticom.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uticom.c,v 1.16 2011/06/19 17:55:37 jsg Exp $ */ +/* $OpenBSD: uticom.c,v 1.17 2011/07/03 15:47:17 matthew Exp $ */ /* * Copyright (c) 2005 Dmitry Komissaroff <dxi@mail.ru>. * @@ -465,9 +465,6 @@ uticom_activate(struct device *self, int act) int rv = 0; switch (act) { - case DVACT_ACTIVATE: - break; - case DVACT_DEACTIVATE: if (sc->sc_subdev != NULL) rv = config_deactivate(sc->sc_subdev); diff --git a/sys/dev/usb/utrh.c b/sys/dev/usb/utrh.c index ba23bb5a86b..73389ec97ee 100644 --- a/sys/dev/usb/utrh.c +++ b/sys/dev/usb/utrh.c @@ -1,4 +1,4 @@ -/* $OpenBSD: utrh.c,v 1.7 2011/01/25 20:03:36 jakemsr Exp $ */ +/* $OpenBSD: utrh.c,v 1.8 2011/07/03 15:47:17 matthew Exp $ */ /* * Copyright (c) 2009 Yojiro UO <yuo@nui.org> @@ -199,9 +199,6 @@ utrh_activate(struct device *self, int act) struct utrh_softc *sc = (struct utrh_softc *)self; switch (act) { - case DVACT_ACTIVATE: - break; - case DVACT_DEACTIVATE: sc->sc_dying = 1; break; diff --git a/sys/dev/usb/uts.c b/sys/dev/usb/uts.c index a626015ede3..db956ec22e0 100644 --- a/sys/dev/usb/uts.c +++ b/sys/dev/usb/uts.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uts.c,v 1.29 2011/03/03 21:48:49 kettenis Exp $ */ +/* $OpenBSD: uts.c,v 1.30 2011/07/03 15:47:17 matthew Exp $ */ /* * Copyright (c) 2007 Robert Nagy <robert@openbsd.org> @@ -254,9 +254,6 @@ uts_activate(struct device *self, int act) int rv = 0; switch (act) { - case DVACT_ACTIVATE: - break; - case DVACT_DEACTIVATE: if (sc->sc_wsmousedev != NULL) rv = config_deactivate(sc->sc_wsmousedev); diff --git a/sys/dev/usb/utwitch.c b/sys/dev/usb/utwitch.c index fbbc84e60eb..dd9720f86e7 100644 --- a/sys/dev/usb/utwitch.c +++ b/sys/dev/usb/utwitch.c @@ -1,4 +1,4 @@ -/* $OpenBSD: utwitch.c,v 1.4 2011/03/02 07:15:45 jasper Exp $ */ +/* $OpenBSD: utwitch.c,v 1.5 2011/07/03 15:47:17 matthew Exp $ */ /* * Copyright (c) 2010 Yojiro UO <yuo@nui.org> @@ -215,9 +215,6 @@ utwitch_activate(struct device *self, int act) struct utwitch_softc *sc = (struct utwitch_softc *)self; switch (act) { - case DVACT_ACTIVATE: - break; - case DVACT_DEACTIVATE: sc->sc_dying = 1; break; diff --git a/sys/dev/usb/uvideo.c b/sys/dev/usb/uvideo.c index 10b5f6e50f1..ceec0096e72 100644 --- a/sys/dev/usb/uvideo.c +++ b/sys/dev/usb/uvideo.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uvideo.c,v 1.163 2011/06/23 22:03:43 oga Exp $ */ +/* $OpenBSD: uvideo.c,v 1.164 2011/07/03 15:47:17 matthew Exp $ */ /* * Copyright (c) 2008 Robert Nagy <robert@openbsd.org> @@ -564,8 +564,6 @@ uvideo_activate(struct device *self, int act) DPRINTF(1, "uvideo_activate: sc=%p\n", sc); switch (act) { - case DVACT_ACTIVATE: - break; case DVACT_DEACTIVATE: if (sc->sc_videodev != NULL) config_deactivate(sc->sc_videodev); diff --git a/sys/dev/usb/uvisor.c b/sys/dev/usb/uvisor.c index 80b52f1892d..dfa2645339e 100644 --- a/sys/dev/usb/uvisor.c +++ b/sys/dev/usb/uvisor.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uvisor.c,v 1.43 2011/01/25 20:03:36 jakemsr Exp $ */ +/* $OpenBSD: uvisor.c,v 1.44 2011/07/03 15:47:18 matthew Exp $ */ /* $NetBSD: uvisor.c,v 1.21 2003/08/03 21:59:26 nathanw Exp $ */ /* @@ -382,8 +382,6 @@ uvisor_activate(struct device *self, int act) int i, rv = 0, r; switch (act) { - case DVACT_ACTIVATE: - break; case DVACT_DEACTIVATE: for (i = 0; i < sc->sc_numcon; i++) if (sc->sc_subdevs[i] != NULL) { diff --git a/sys/dev/usb/uvscom.c b/sys/dev/usb/uvscom.c index d3f087ca2e0..328eea456a5 100644 --- a/sys/dev/usb/uvscom.c +++ b/sys/dev/usb/uvscom.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uvscom.c,v 1.23 2011/01/25 20:03:36 jakemsr Exp $ */ +/* $OpenBSD: uvscom.c,v 1.24 2011/07/03 15:47:18 matthew Exp $ */ /* $NetBSD: uvscom.c,v 1.9 2003/02/12 15:36:20 ichiro Exp $ */ /*- * Copyright (c) 2001-2002, Shunsuke Akiyama <akiyama@jp.FreeBSD.org>. @@ -394,9 +394,6 @@ uvscom_activate(struct device *self, int act) int rv = 0; switch (act) { - case DVACT_ACTIVATE: - break; - case DVACT_DEACTIVATE: if (sc->sc_subdev != NULL) rv = config_deactivate(sc->sc_subdev); diff --git a/sys/dev/usb/uyap.c b/sys/dev/usb/uyap.c index e28918d158e..a5ce28e5c25 100644 --- a/sys/dev/usb/uyap.c +++ b/sys/dev/usb/uyap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uyap.c,v 1.18 2010/12/27 03:03:50 jakemsr Exp $ */ +/* $OpenBSD: uyap.c,v 1.19 2011/07/03 15:47:18 matthew Exp $ */ /* $NetBSD: uyap.c,v 1.6 2002/07/11 21:14:37 augustss Exp $ */ /* @@ -128,9 +128,6 @@ uyap_activate(struct device *self, int act) struct uyap_softc *sc = (struct uyap_softc *)self; switch (act) { - case DVACT_ACTIVATE: - break; - case DVACT_DEACTIVATE: usbd_deactivate(sc->sc_udev); break; |