diff options
| author | dyoung <dyoung@NetBSD.org> | 2009-12-06 20:20:12 +0000 |
|---|---|---|
| committer | dyoung <dyoung@NetBSD.org> | 2009-12-06 20:20:12 +0000 |
| commit | 110a4ba3b4e2807bafbdadcf0d3f2c623558121a (patch) | |
| tree | 47110e832c5eea97fe8da3259a326e5f8f3a9126 /sys | |
| parent | 8641587693707d67ef039f93bda542559cd951ec (diff) | |
Simplify several device-activation hooks.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/usb/if_atu.c | 12 | ||||
| -rw-r--r-- | sys/dev/usb/if_aue.c | 13 | ||||
| -rw-r--r-- | sys/dev/usb/if_axe.c | 13 | ||||
| -rw-r--r-- | sys/dev/usb/if_cdce.c | 13 | ||||
| -rw-r--r-- | sys/dev/usb/if_cue.c | 13 | ||||
| -rw-r--r-- | sys/dev/usb/if_kue.c | 15 | ||||
| -rw-r--r-- | sys/dev/usb/if_rum.c | 13 | ||||
| -rw-r--r-- | sys/dev/usb/if_udav.c | 13 | ||||
| -rw-r--r-- | sys/dev/usb/if_upl.c | 13 | ||||
| -rw-r--r-- | sys/dev/usb/if_ural.c | 14 | ||||
| -rw-r--r-- | sys/dev/usb/if_url.c | 14 | ||||
| -rw-r--r-- | sys/dev/usb/if_zyd.c | 12 |
12 files changed, 60 insertions, 98 deletions
diff --git a/sys/dev/usb/if_atu.c b/sys/dev/usb/if_atu.c index 81924ed67b9..555be4b6cfa 100644 --- a/sys/dev/usb/if_atu.c +++ b/sys/dev/usb/if_atu.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_atu.c,v 1.33 2009/09/23 19:07:19 plunky Exp $ */ +/* $NetBSD: if_atu.c,v 1.34 2009/12/06 20:20:12 dyoung Exp $ */ /* $OpenBSD: if_atu.c,v 1.48 2004/12/30 01:53:21 dlg Exp $ */ /* * Copyright (c) 2003, 2004 @@ -48,7 +48,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_atu.c,v 1.33 2009/09/23 19:07:19 plunky Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_atu.c,v 1.34 2009/12/06 20:20:12 dyoung Exp $"); #include "bpfilter.h" @@ -1429,17 +1429,15 @@ atu_activate(device_t self, enum devact act) struct atu_softc *sc = device_private(self); switch (act) { - case DVACT_ACTIVATE: - return (EOPNOTSUPP); - break; case DVACT_DEACTIVATE: if (sc->sc_state != ATU_S_UNCONFIG) { if_deactivate(&sc->atu_ec.ec_if); sc->sc_state = ATU_S_DEAD; } - break; + return 0; + default: + return EOPNOTSUPP; } - return (0); } /* diff --git a/sys/dev/usb/if_aue.c b/sys/dev/usb/if_aue.c index 72f75227404..83e8357a27a 100644 --- a/sys/dev/usb/if_aue.c +++ b/sys/dev/usb/if_aue.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_aue.c,v 1.115 2009/09/23 19:07:19 plunky Exp $ */ +/* $NetBSD: if_aue.c,v 1.116 2009/12/06 20:20:12 dyoung Exp $ */ /* * Copyright (c) 1997, 1998, 1999, 2000 * Bill Paul <wpaul@ee.columbia.edu>. All rights reserved. @@ -77,7 +77,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_aue.c,v 1.115 2009/09/23 19:07:19 plunky Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_aue.c,v 1.116 2009/12/06 20:20:12 dyoung Exp $"); #include "opt_inet.h" #include "bpfilter.h" @@ -955,16 +955,13 @@ aue_activate(device_t self, enum devact act) DPRINTFN(2,("%s: %s: enter\n", device_xname(sc->aue_dev), __func__)); switch (act) { - case DVACT_ACTIVATE: - return (EOPNOTSUPP); - break; - case DVACT_DEACTIVATE: if_deactivate(&sc->aue_ec.ec_if); sc->aue_dying = 1; - break; + return 0; + default: + return EOPNOTSUPP; } - return (0); } /* diff --git a/sys/dev/usb/if_axe.c b/sys/dev/usb/if_axe.c index 27f26beb7ff..35f46a1f212 100644 --- a/sys/dev/usb/if_axe.c +++ b/sys/dev/usb/if_axe.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_axe.c,v 1.29 2009/09/23 19:07:19 plunky Exp $ */ +/* $NetBSD: if_axe.c,v 1.30 2009/12/06 20:20:12 dyoung Exp $ */ /* * Copyright (c) 1997, 1998, 1999, 2000-2003 @@ -73,7 +73,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_axe.c,v 1.29 2009/09/23 19:07:19 plunky Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_axe.c,v 1.30 2009/12/06 20:20:12 dyoung Exp $"); #if defined(__NetBSD__) #include "opt_inet.h" @@ -635,16 +635,13 @@ axe_activate(device_t self, enum devact act) DPRINTFN(2,("%s: %s: enter\n", USBDEVNAME(sc->axe_dev), __func__)); switch (act) { - case DVACT_ACTIVATE: - return (EOPNOTSUPP); - break; - case DVACT_DEACTIVATE: if_deactivate(&sc->axe_ec.ec_if); sc->axe_dying = 1; - break; + return 0; + default: + return EOPNOTSUPP; } - return (0); } /* diff --git a/sys/dev/usb/if_cdce.c b/sys/dev/usb/if_cdce.c index 9de8f8a829a..273b395d2b2 100644 --- a/sys/dev/usb/if_cdce.c +++ b/sys/dev/usb/if_cdce.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_cdce.c,v 1.25 2009/09/23 19:07:19 plunky Exp $ */ +/* $NetBSD: if_cdce.c,v 1.26 2009/12/06 20:20:12 dyoung Exp $ */ /* * Copyright (c) 1997, 1998, 1999, 2000-2003 Bill Paul <wpaul@windriver.com> @@ -41,7 +41,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_cdce.c,v 1.25 2009/09/23 19:07:19 plunky Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_cdce.c,v 1.26 2009/12/06 20:20:12 dyoung Exp $"); #include "bpfilter.h" #ifdef __NetBSD__ #include "opt_inet.h" @@ -790,16 +790,13 @@ cdce_activate(device_t self, enum devact act) struct cdce_softc *sc = device_private(self); switch (act) { - case DVACT_ACTIVATE: - return (EOPNOTSUPP); - break; - case DVACT_DEACTIVATE: if_deactivate(GET_IFP(sc)); sc->cdce_dying = 1; - break; + return 0; + default: + return EOPNOTSUPP; } - return (0); } diff --git a/sys/dev/usb/if_cue.c b/sys/dev/usb/if_cue.c index 32de7e673bd..8cbe64d0223 100644 --- a/sys/dev/usb/if_cue.c +++ b/sys/dev/usb/if_cue.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_cue.c,v 1.55 2009/09/23 19:07:19 plunky Exp $ */ +/* $NetBSD: if_cue.c,v 1.56 2009/12/06 20:20:12 dyoung Exp $ */ /* * Copyright (c) 1997, 1998, 1999, 2000 * Bill Paul <wpaul@ee.columbia.edu>. All rights reserved. @@ -56,7 +56,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_cue.c,v 1.55 2009/09/23 19:07:19 plunky Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_cue.c,v 1.56 2009/12/06 20:20:12 dyoung Exp $"); #if defined(__NetBSD__) #include "opt_inet.h" @@ -648,17 +648,14 @@ cue_activate(device_ptr_t self, enum devact act) DPRINTFN(2,("%s: %s: enter\n", USBDEVNAME(sc->cue_dev), __func__)); switch (act) { - case DVACT_ACTIVATE: - return (EOPNOTSUPP); - break; - case DVACT_DEACTIVATE: /* Deactivate the interface. */ if_deactivate(&sc->cue_ec.ec_if); sc->cue_dying = 1; - break; + return 0; + default: + return EOPNOTSUPP; } - return (0); } /* diff --git a/sys/dev/usb/if_kue.c b/sys/dev/usb/if_kue.c index fb17c93a735..7b07398db5c 100644 --- a/sys/dev/usb/if_kue.c +++ b/sys/dev/usb/if_kue.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_kue.c,v 1.66 2009/09/23 19:07:19 plunky Exp $ */ +/* $NetBSD: if_kue.c,v 1.67 2009/12/06 20:20:12 dyoung Exp $ */ /* * Copyright (c) 1997, 1998, 1999, 2000 * Bill Paul <wpaul@ee.columbia.edu>. All rights reserved. @@ -70,7 +70,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_kue.c,v 1.66 2009/09/23 19:07:19 plunky Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_kue.c,v 1.67 2009/12/06 20:20:12 dyoung Exp $"); #if defined(__NetBSD__) #include "opt_inet.h" @@ -593,19 +593,14 @@ kue_activate(device_ptr_t self, enum devact act) DPRINTFN(2,("%s: %s: enter\n", USBDEVNAME(sc->kue_dev), __func__)); switch (act) { - case DVACT_ACTIVATE: - return (EOPNOTSUPP); - break; - case DVACT_DEACTIVATE: -#if defined(__NetBSD__) /* Deactivate the interface. */ if_deactivate(&sc->kue_ec.ec_if); -#endif sc->kue_dying = 1; - break; + return 0; + default: + return EOPNOTSUPP; } - return (0); } /* diff --git a/sys/dev/usb/if_rum.c b/sys/dev/usb/if_rum.c index c0089d5d17f..ebef31cbaca 100644 --- a/sys/dev/usb/if_rum.c +++ b/sys/dev/usb/if_rum.c @@ -1,5 +1,5 @@ /* $OpenBSD: if_rum.c,v 1.40 2006/09/18 16:20:20 damien Exp $ */ -/* $NetBSD: if_rum.c,v 1.29 2009/09/28 10:22:07 pooka Exp $ */ +/* $NetBSD: if_rum.c,v 1.30 2009/12/06 20:20:12 dyoung Exp $ */ /*- * Copyright (c) 2005-2007 Damien Bergamini <damien.bergamini@free.fr> @@ -24,7 +24,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_rum.c,v 1.29 2009/09/28 10:22:07 pooka Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_rum.c,v 1.30 2009/12/06 20:20:12 dyoung Exp $"); #include "bpfilter.h" @@ -2287,13 +2287,10 @@ int rum_activate(device_ptr_t self, enum devact act) { switch (act) { - case DVACT_ACTIVATE: - return EOPNOTSUPP; - case DVACT_DEACTIVATE: /*if_deactivate(&sc->sc_ic.ic_if);*/ - break; + return 0; + default: + return EOPNOTSUPP; } - - return 0; } diff --git a/sys/dev/usb/if_udav.c b/sys/dev/usb/if_udav.c index bde75df8c53..2f81c8f946f 100644 --- a/sys/dev/usb/if_udav.c +++ b/sys/dev/usb/if_udav.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_udav.c,v 1.26 2009/09/23 19:07:19 plunky Exp $ */ +/* $NetBSD: if_udav.c,v 1.27 2009/12/06 20:20:12 dyoung Exp $ */ /* $nabe: if_udav.c,v 1.3 2003/08/21 16:57:19 nabe Exp $ */ /* * Copyright (c) 2003 @@ -44,7 +44,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_udav.c,v 1.26 2009/09/23 19:07:19 plunky Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_udav.c,v 1.27 2009/12/06 20:20:12 dyoung Exp $"); #include "opt_inet.h" #include "bpfilter.h" @@ -736,16 +736,13 @@ udav_activate(device_ptr_t self, enum devact act) DPRINTF(("%s: %s: enter, act=%d\n", USBDEVNAME(sc->sc_dev), __func__, act)); switch (act) { - case DVACT_ACTIVATE: - return (EOPNOTSUPP); - break; - case DVACT_DEACTIVATE: if_deactivate(&sc->sc_ec.ec_if); sc->sc_dying = 1; - break; + return 0; + default: + return EOPNOTSUPP; } - return (0); } #define UDAV_BITS 6 diff --git a/sys/dev/usb/if_upl.c b/sys/dev/usb/if_upl.c index 722724b1985..fac62c2bffc 100644 --- a/sys/dev/usb/if_upl.c +++ b/sys/dev/usb/if_upl.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_upl.c,v 1.34 2009/09/23 19:07:19 plunky Exp $ */ +/* $NetBSD: if_upl.c,v 1.35 2009/12/06 20:20:12 dyoung Exp $ */ /* * Copyright (c) 2000 The NetBSD Foundation, Inc. * All rights reserved. @@ -34,7 +34,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_upl.c,v 1.34 2009/09/23 19:07:19 plunky Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_upl.c,v 1.35 2009/12/06 20:20:12 dyoung Exp $"); #include "opt_inet.h" #include "bpfilter.h" @@ -377,17 +377,14 @@ upl_activate(device_ptr_t self, enum devact act) DPRINTFN(2,("%s: %s: enter\n", USBDEVNAME(sc->sc_dev), __func__)); switch (act) { - case DVACT_ACTIVATE: - return (EOPNOTSUPP); - break; - case DVACT_DEACTIVATE: /* Deactivate the interface. */ if_deactivate(&sc->sc_if); sc->sc_dying = 1; - break; + return 0; + default: + return EOPNOTSUPP; } - return (0); } /* diff --git a/sys/dev/usb/if_ural.c b/sys/dev/usb/if_ural.c index c514108f132..e5045e074d8 100644 --- a/sys/dev/usb/if_ural.c +++ b/sys/dev/usb/if_ural.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_ural.c,v 1.32 2009/09/23 19:07:19 plunky Exp $ */ +/* $NetBSD: if_ural.c,v 1.33 2009/12/06 20:20:12 dyoung Exp $ */ /* $FreeBSD: /repoman/r/ncvs/src/sys/dev/usb/if_ural.c,v 1.40 2006/06/02 23:14:40 sam Exp $ */ /*- @@ -24,7 +24,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_ural.c,v 1.32 2009/09/23 19:07:19 plunky Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_ural.c,v 1.33 2009/12/06 20:20:12 dyoung Exp $"); #include "bpfilter.h" @@ -2306,16 +2306,12 @@ ural_activate(device_ptr_t self, enum devact act) struct ural_softc *sc = device_private(self); switch (act) { - case DVACT_ACTIVATE: - return EOPNOTSUPP; - break; - case DVACT_DEACTIVATE: if_deactivate(&sc->sc_if); - break; + return 0; + default: + return EOPNOTSUPP; } - - return 0; } Static void diff --git a/sys/dev/usb/if_url.c b/sys/dev/usb/if_url.c index 8ff27a123a9..d90f54b31a3 100644 --- a/sys/dev/usb/if_url.c +++ b/sys/dev/usb/if_url.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_url.c,v 1.34 2009/09/23 19:07:19 plunky Exp $ */ +/* $NetBSD: if_url.c,v 1.35 2009/12/06 20:20:12 dyoung Exp $ */ /* * Copyright (c) 2001, 2002 * Shingo WATANABE <nabe@nabechan.org>. All rights reserved. @@ -43,7 +43,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_url.c,v 1.34 2009/09/23 19:07:19 plunky Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_url.c,v 1.35 2009/12/06 20:20:12 dyoung Exp $"); #include "opt_inet.h" #include "bpfilter.h" @@ -617,17 +617,13 @@ url_activate(device_ptr_t self, enum devact act) __func__, act)); switch (act) { - case DVACT_ACTIVATE: - return (EOPNOTSUPP); - break; - case DVACT_DEACTIVATE: if_deactivate(&sc->sc_ec.ec_if); sc->sc_dying = 1; - break; + return 0; + default: + return EOPNOTSUPP; } - - return (0); } #define url_calchash(addr) (ether_crc32_be((addr), ETHER_ADDR_LEN) >> 26) diff --git a/sys/dev/usb/if_zyd.c b/sys/dev/usb/if_zyd.c index 93780d57d1c..e632c394ca9 100644 --- a/sys/dev/usb/if_zyd.c +++ b/sys/dev/usb/if_zyd.c @@ -1,5 +1,5 @@ /* $OpenBSD: if_zyd.c,v 1.52 2007/02/11 00:08:04 jsg Exp $ */ -/* $NetBSD: if_zyd.c,v 1.22 2009/09/23 19:07:19 plunky Exp $ */ +/* $NetBSD: if_zyd.c,v 1.23 2009/12/06 20:20:12 dyoung Exp $ */ /*- * Copyright (c) 2006 by Damien Bergamini <damien.bergamini@free.fr> @@ -22,7 +22,7 @@ * ZyDAS ZD1211/ZD1211B USB WLAN driver. */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_zyd.c,v 1.22 2009/09/23 19:07:19 plunky Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_zyd.c,v 1.23 2009/12/06 20:20:12 dyoung Exp $"); #include "bpfilter.h" @@ -2693,12 +2693,10 @@ zyd_activate(device_ptr_t self, enum devact act) struct zyd_softc *sc = device_private(self); switch (act) { - case DVACT_ACTIVATE: - break; - case DVACT_DEACTIVATE: if_deactivate(&sc->sc_if); - break; + return 0; + default: + return EOPNOTSUPP; } - return 0; } |
