Module Name: src
Committed By: dyoung
Date: Thu Nov 12 19:58:27 UTC 2009
Modified Files:
src/sys/dev/usb: uhidev.c uhmodem.c uipaq.c uirda.c ukbd.c umass.c
umct.c umidi.c umodem_common.c ums.c uplcom.c
Log Message:
Simplify activation hooks. (sc_dying must die!)
To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.45 src/sys/dev/usb/uhidev.c
cvs rdiff -u -r1.8 -r1.9 src/sys/dev/usb/uhmodem.c
cvs rdiff -u -r1.14 -r1.15 src/sys/dev/usb/uipaq.c
cvs rdiff -u -r1.32 -r1.33 src/sys/dev/usb/uirda.c
cvs rdiff -u -r1.104 -r1.105 src/sys/dev/usb/ukbd.c
cvs rdiff -u -r1.135 -r1.136 src/sys/dev/usb/umass.c
cvs rdiff -u -r1.28 -r1.29 src/sys/dev/usb/umct.c
cvs rdiff -u -r1.39 -r1.40 src/sys/dev/usb/umidi.c
cvs rdiff -u -r1.16 -r1.17 src/sys/dev/usb/umodem_common.c
cvs rdiff -u -r1.75 -r1.76 src/sys/dev/usb/ums.c
cvs rdiff -u -r1.68 -r1.69 src/sys/dev/usb/uplcom.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/usb/uhidev.c
diff -u src/sys/dev/usb/uhidev.c:1.44 src/sys/dev/usb/uhidev.c:1.45
--- src/sys/dev/usb/uhidev.c:1.44 Fri Nov 6 04:42:27 2009
+++ src/sys/dev/usb/uhidev.c Thu Nov 12 19:58:27 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: uhidev.c,v 1.44 2009/11/06 04:42:27 rafal Exp $ */
+/* $NetBSD: uhidev.c,v 1.45 2009/11/12 19:58:27 dyoung Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uhidev.c,v 1.44 2009/11/06 04:42:27 rafal Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uhidev.c,v 1.45 2009/11/12 19:58:27 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -356,25 +356,14 @@
uhidev_activate(device_t self, enum devact act)
{
struct uhidev_softc *sc = device_private(self);
- int i, rv;
switch (act) {
- case DVACT_ACTIVATE:
- return (EOPNOTSUPP);
-
case DVACT_DEACTIVATE:
- rv = 0;
- for (i = 0; i < sc->sc_nrepid; i++)
- if (sc->sc_subdevs[i] != NULL)
- rv |= config_deactivate(
- sc->sc_subdevs[i]);
sc->sc_dying = 1;
- break;
+ return 0;
default:
- rv = 0;
- break;
+ return EOPNOTSUPP;
}
- return (rv);
}
void
Index: src/sys/dev/usb/uhmodem.c
diff -u src/sys/dev/usb/uhmodem.c:1.8 src/sys/dev/usb/uhmodem.c:1.9
--- src/sys/dev/usb/uhmodem.c:1.8 Wed Sep 23 19:07:19 2009
+++ src/sys/dev/usb/uhmodem.c Thu Nov 12 19:58:27 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: uhmodem.c,v 1.8 2009/09/23 19:07:19 plunky Exp $ */
+/* $NetBSD: uhmodem.c,v 1.9 2009/11/12 19:58:27 dyoung Exp $ */
/*
* Copyright (c) 2008 Yojiro UO <y...@nui.org>.
@@ -71,7 +71,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uhmodem.c,v 1.8 2009/09/23 19:07:19 plunky Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uhmodem.c,v 1.9 2009/11/12 19:58:27 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -422,22 +422,14 @@
uhmodem_activate(device_t self, enum devact act)
{
struct uhmodem_softc *sc = device_private(self);
- int rv = 0;
- int i;
switch (act) {
- case DVACT_ACTIVATE:
- return (EOPNOTSUPP);
-
case DVACT_DEACTIVATE:
- for (i = 0; i < sc->sc_ubsa.sc_numif; i++) {
- if (sc->sc_ubsa.sc_subdevs[i] != NULL)
- rv |= config_deactivate(sc->sc_ubsa.sc_subdevs[i]);
- }
sc->sc_ubsa.sc_dying = 1;
- break;
+ return 0;
+ default:
+ return EOPNOTSUPP;
}
- return (rv);
}
Static int
Index: src/sys/dev/usb/uipaq.c
diff -u src/sys/dev/usb/uipaq.c:1.14 src/sys/dev/usb/uipaq.c:1.15
--- src/sys/dev/usb/uipaq.c:1.14 Wed Sep 23 19:07:19 2009
+++ src/sys/dev/usb/uipaq.c Thu Nov 12 19:58:27 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: uipaq.c,v 1.14 2009/09/23 19:07:19 plunky Exp $ */
+/* $NetBSD: uipaq.c,v 1.15 2009/11/12 19:58:27 dyoung Exp $ */
/* $OpenBSD: uipaq.c,v 1.1 2005/06/17 23:50:33 deraadt Exp $ */
/*
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uipaq.c,v 1.14 2009/09/23 19:07:19 plunky Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipaq.c,v 1.15 2009/11/12 19:58:27 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -362,20 +362,14 @@
uipaq_activate(device_t self, enum devact act)
{
struct uipaq_softc *sc = device_private(self);
- int rv = 0;
switch (act) {
- case DVACT_ACTIVATE:
- return (EOPNOTSUPP);
- break;
-
case DVACT_DEACTIVATE:
- if (sc->sc_subdev != NULL)
- rv = config_deactivate(sc->sc_subdev);
sc->sc_dying = 1;
- break;
+ return 0;
+ default:
+ return EOPNOTSUPP;
}
- return (rv);
}
void
Index: src/sys/dev/usb/uirda.c
diff -u src/sys/dev/usb/uirda.c:1.32 src/sys/dev/usb/uirda.c:1.33
--- src/sys/dev/usb/uirda.c:1.32 Wed Sep 23 19:07:19 2009
+++ src/sys/dev/usb/uirda.c Thu Nov 12 19:58:27 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: uirda.c,v 1.32 2009/09/23 19:07:19 plunky Exp $ */
+/* $NetBSD: uirda.c,v 1.33 2009/11/12 19:58:27 dyoung Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uirda.c,v 1.32 2009/09/23 19:07:19 plunky Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uirda.c,v 1.33 2009/11/12 19:58:27 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -344,20 +344,14 @@
uirda_activate(device_t self, enum devact act)
{
struct uirda_softc *sc = device_private(self);
- int error = 0;
switch (act) {
- case DVACT_ACTIVATE:
- return (EOPNOTSUPP);
- break;
-
case DVACT_DEACTIVATE:
sc->sc_dying = 1;
- if (sc->sc_child != NULL)
- error = config_deactivate(sc->sc_child);
- break;
+ return 0;
+ default:
+ return EOPNOTSUPP;
}
- return (error);
}
int
Index: src/sys/dev/usb/ukbd.c
diff -u src/sys/dev/usb/ukbd.c:1.104 src/sys/dev/usb/ukbd.c:1.105
--- src/sys/dev/usb/ukbd.c:1.104 Sat Jul 11 18:26:58 2009
+++ src/sys/dev/usb/ukbd.c Thu Nov 12 19:58:27 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: ukbd.c,v 1.104 2009/07/11 18:26:58 jakllsch Exp $ */
+/* $NetBSD: ukbd.c,v 1.105 2009/11/12 19:58:27 dyoung Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ukbd.c,v 1.104 2009/07/11 18:26:58 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ukbd.c,v 1.105 2009/11/12 19:58:27 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -416,19 +416,14 @@
ukbd_activate(device_t self, enum devact act)
{
struct ukbd_softc *sc = device_private(self);
- int rv = 0;
switch (act) {
- case DVACT_ACTIVATE:
- return (EOPNOTSUPP);
-
case DVACT_DEACTIVATE:
- if (sc->sc_wskbddev != NULL)
- rv = config_deactivate(sc->sc_wskbddev);
sc->sc_dying = 1;
- break;
+ return 0;
+ default:
+ return EOPNOTSUPP;
}
- return (rv);
}
int
Index: src/sys/dev/usb/umass.c
diff -u src/sys/dev/usb/umass.c:1.135 src/sys/dev/usb/umass.c:1.136
--- src/sys/dev/usb/umass.c:1.135 Fri Oct 30 16:22:32 2009
+++ src/sys/dev/usb/umass.c Thu Nov 12 19:58:27 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: umass.c,v 1.135 2009/10/30 16:22:32 is Exp $ */
+/* $NetBSD: umass.c,v 1.136 2009/11/12 19:58:27 dyoung Exp $ */
/*
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -124,7 +124,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: umass.c,v 1.135 2009/10/30 16:22:32 is Exp $");
+__KERNEL_RCSID(0, "$NetBSD: umass.c,v 1.136 2009/11/12 19:58:27 dyoung Exp $");
#include "atapibus.h"
#include "scsibus.h"
@@ -707,21 +707,14 @@
umass_activate(device_t dev, enum devact act)
{
struct umass_softc *sc = device_private(dev);
- struct umassbus_softc *scbus = sc->bus;
- int rv;
DPRINTF(UDMASS_USB, ("%s: umass_activate: %d\n",
- device_xname(sc->sc_dev), act));
+ device_xname(dev), act));
switch (act) {
case DVACT_DEACTIVATE:
sc->sc_dying = 1;
- if (scbus == NULL || scbus->sc_child == NULL)
- return 0;
- rv = config_deactivate(scbus->sc_child);
- DPRINTF(UDMASS_USB, ("%s: umass_deactivate: child "
- "returned %d\n", device_xname(sc->sc_dev), rv));
- return rv;
+ return 0;
default:
return EOPNOTSUPP;
}
Index: src/sys/dev/usb/umct.c
diff -u src/sys/dev/usb/umct.c:1.28 src/sys/dev/usb/umct.c:1.29
--- src/sys/dev/usb/umct.c:1.28 Wed Sep 23 19:07:19 2009
+++ src/sys/dev/usb/umct.c Thu Nov 12 19:58:27 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: umct.c,v 1.28 2009/09/23 19:07:19 plunky Exp $ */
+/* $NetBSD: umct.c,v 1.29 2009/11/12 19:58:27 dyoung Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: umct.c,v 1.28 2009/09/23 19:07:19 plunky Exp $");
+__KERNEL_RCSID(0, "$NetBSD: umct.c,v 1.29 2009/11/12 19:58:27 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -342,19 +342,14 @@
umct_activate(device_t self, enum devact act)
{
struct umct_softc *sc = device_private(self);
- int rv = 0;
switch (act) {
- case DVACT_ACTIVATE:
- return (EOPNOTSUPP);
-
case DVACT_DEACTIVATE:
- if (sc->sc_subdev != NULL)
- rv = config_deactivate(sc->sc_subdev);
sc->sc_dying = 1;
- break;
+ return 0;
+ default:
+ return EOPNOTSUPP;
}
- return (rv);
}
void
Index: src/sys/dev/usb/umidi.c
diff -u src/sys/dev/usb/umidi.c:1.39 src/sys/dev/usb/umidi.c:1.40
--- src/sys/dev/usb/umidi.c:1.39 Sun Jan 11 11:06:08 2009
+++ src/sys/dev/usb/umidi.c Thu Nov 12 19:58:27 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: umidi.c,v 1.39 2009/01/11 11:06:08 cegger Exp $ */
+/* $NetBSD: umidi.c,v 1.40 2009/11/12 19:58:27 dyoung Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: umidi.c,v 1.39 2009/01/11 11:06:08 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: umidi.c,v 1.40 2009/11/12 19:58:27 dyoung Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -104,12 +104,12 @@
static usbd_status attach_mididev(struct umidi_softc *, struct umidi_mididev *);
static usbd_status detach_mididev(struct umidi_mididev *, int);
-static usbd_status deactivate_mididev(struct umidi_mididev *);
+static void deactivate_mididev(struct umidi_mididev *);
static usbd_status alloc_all_mididevs(struct umidi_softc *, int);
static void free_all_mididevs(struct umidi_softc *);
static usbd_status attach_all_mididevs(struct umidi_softc *);
static usbd_status detach_all_mididevs(struct umidi_softc *, int);
-static usbd_status deactivate_all_mididevs(struct umidi_softc *);
+static void deactivate_all_mididevs(struct umidi_softc *);
static char *describe_mididev(struct umidi_mididev *);
#ifdef UMIDI_DEBUG
@@ -264,18 +264,15 @@
struct umidi_softc *sc = device_private(self);
switch (act) {
- case DVACT_ACTIVATE:
- DPRINTFN(1,("umidi_activate (activate)\n"));
-
- return EOPNOTSUPP;
- break;
case DVACT_DEACTIVATE:
DPRINTFN(1,("umidi_activate (deactivate)\n"));
sc->sc_dying = 1;
deactivate_all_mididevs(sc);
- break;
+ return 0;
+ default:
+ DPRINTFN(1,("umidi_activate (%d)\n", act));
+ return EOPNOTSUPP;
}
- return 0;
}
USB_DETACH(umidi)
@@ -1189,16 +1186,13 @@
return USBD_NORMAL_COMPLETION;
}
-static usbd_status
+static void
deactivate_mididev(struct umidi_mididev *mididev)
{
if (mididev->out_jack)
mididev->out_jack->binded = 0;
if (mididev->in_jack)
mididev->in_jack->binded = 0;
- config_deactivate(mididev->mdev);
-
- return USBD_NORMAL_COMPLETION;
}
static usbd_status
@@ -1253,20 +1247,15 @@
return USBD_NORMAL_COMPLETION;
}
-static usbd_status
+static void
deactivate_all_mididevs(struct umidi_softc *sc)
{
- usbd_status err;
int i;
- if (sc->sc_mididevs)
- for (i=0; i<sc->sc_num_mididevs; i++) {
- err = deactivate_mididev(&sc->sc_mididevs[i]);
- if (err!=USBD_NORMAL_COMPLETION)
- return err;
- }
-
- return USBD_NORMAL_COMPLETION;
+ if (sc->sc_mididevs) {
+ for (i=0; i<sc->sc_num_mididevs; i++)
+ deactivate_mididev(&sc->sc_mididevs[i]);
+ }
}
/*
Index: src/sys/dev/usb/umodem_common.c
diff -u src/sys/dev/usb/umodem_common.c:1.16 src/sys/dev/usb/umodem_common.c:1.17
--- src/sys/dev/usb/umodem_common.c:1.16 Wed Sep 23 19:07:19 2009
+++ src/sys/dev/usb/umodem_common.c Thu Nov 12 19:58:27 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: umodem_common.c,v 1.16 2009/09/23 19:07:19 plunky Exp $ */
+/* $NetBSD: umodem_common.c,v 1.17 2009/11/12 19:58:27 dyoung Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -44,7 +44,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: umodem_common.c,v 1.16 2009/09/23 19:07:19 plunky Exp $");
+__KERNEL_RCSID(0, "$NetBSD: umodem_common.c,v 1.17 2009/11/12 19:58:27 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -635,19 +635,13 @@
int
umodem_common_activate(struct umodem_softc *sc, enum devact act)
{
- int rv = 0;
-
switch (act) {
- case DVACT_ACTIVATE:
- return (EOPNOTSUPP);
-
case DVACT_DEACTIVATE:
sc->sc_dying = 1;
- if (sc->sc_subdev)
- rv = config_deactivate(sc->sc_subdev);
- break;
+ return 0;
+ default:
+ return EOPNOTSUPP;
}
- return (rv);
}
void
Index: src/sys/dev/usb/ums.c
diff -u src/sys/dev/usb/ums.c:1.75 src/sys/dev/usb/ums.c:1.76
--- src/sys/dev/usb/ums.c:1.75 Fri Nov 6 04:42:27 2009
+++ src/sys/dev/usb/ums.c Thu Nov 12 19:58:27 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: ums.c,v 1.75 2009/11/06 04:42:27 rafal Exp $ */
+/* $NetBSD: ums.c,v 1.76 2009/11/12 19:58:27 dyoung Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ums.c,v 1.75 2009/11/06 04:42:27 rafal Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ums.c,v 1.76 2009/11/12 19:58:27 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -320,19 +320,14 @@
ums_activate(device_ptr_t self, enum devact act)
{
struct ums_softc *sc = device_private(self);
- int rv = 0;
switch (act) {
- case DVACT_ACTIVATE:
- return (EOPNOTSUPP);
-
case DVACT_DEACTIVATE:
- if (sc->sc_wsmousedev != NULL)
- rv = config_deactivate(sc->sc_wsmousedev);
sc->sc_dying = 1;
- break;
+ return 0;
+ default:
+ return EOPNOTSUPP;
}
- return (rv);
}
void
Index: src/sys/dev/usb/uplcom.c
diff -u src/sys/dev/usb/uplcom.c:1.68 src/sys/dev/usb/uplcom.c:1.69
--- src/sys/dev/usb/uplcom.c:1.68 Wed Sep 23 19:07:19 2009
+++ src/sys/dev/usb/uplcom.c Thu Nov 12 19:58:27 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: uplcom.c,v 1.68 2009/09/23 19:07:19 plunky Exp $ */
+/* $NetBSD: uplcom.c,v 1.69 2009/11/12 19:58:27 dyoung Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uplcom.c,v 1.68 2009/09/23 19:07:19 plunky Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uplcom.c,v 1.69 2009/11/12 19:58:27 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -453,19 +453,14 @@
uplcom_activate(device_t self, enum devact act)
{
struct uplcom_softc *sc = device_private(self);
- int rv = 0;
switch (act) {
- case DVACT_ACTIVATE:
- return (EOPNOTSUPP);
-
case DVACT_DEACTIVATE:
- if (sc->sc_subdev != NULL)
- rv = config_deactivate(sc->sc_subdev);
sc->sc_dying = 1;
- break;
+ return 0;
+ default:
+ return EOPNOTSUPP;
}
- return (rv);
}
usbd_status
