Module Name: src
Committed By: dyoung
Date: Thu Nov 12 19:51:45 UTC 2009
Modified Files:
src/sys/dev/usb: ubsa.c uchcom.c udsbr.c uep.c uftdi.c ugensa.c
Log Message:
Simplify activation hooks. (sc_dying must die!)
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/sys/dev/usb/ubsa.c
cvs rdiff -u -r1.8 -r1.9 src/sys/dev/usb/uchcom.c
cvs rdiff -u -r1.16 -r1.17 src/sys/dev/usb/udsbr.c
cvs rdiff -u -r1.13 -r1.14 src/sys/dev/usb/uep.c
cvs rdiff -u -r1.43 -r1.44 src/sys/dev/usb/uftdi.c
cvs rdiff -u -r1.23 -r1.24 src/sys/dev/usb/ugensa.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/ubsa.c
diff -u src/sys/dev/usb/ubsa.c:1.24 src/sys/dev/usb/ubsa.c:1.25
--- src/sys/dev/usb/ubsa.c:1.24 Wed Sep 23 19:07:19 2009
+++ src/sys/dev/usb/ubsa.c Thu Nov 12 19:51:44 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: ubsa.c,v 1.24 2009/09/23 19:07:19 plunky Exp $ */
+/* $NetBSD: ubsa.c,v 1.25 2009/11/12 19:51:44 dyoung Exp $ */
/*-
* Copyright (c) 2002, Alexander Kabaev <kan.FreeBSD.org>.
* All rights reserved.
@@ -54,7 +54,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ubsa.c,v 1.24 2009/09/23 19:07:19 plunky Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ubsa.c,v 1.25 2009/11/12 19:51:44 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -354,21 +354,12 @@
ubsa_activate(device_ptr_t self, enum devact act)
{
struct ubsa_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_numif; i++) {
- if (sc->sc_subdevs[i] != NULL)
- rv |= config_deactivate(sc->sc_subdevs[i]);
- }
sc->sc_dying = 1;
- break;
+ return 0;
+ default:
+ return EOPNOTSUPP;
}
- return (rv);
}
-
Index: src/sys/dev/usb/uchcom.c
diff -u src/sys/dev/usb/uchcom.c:1.8 src/sys/dev/usb/uchcom.c:1.9
--- src/sys/dev/usb/uchcom.c:1.8 Wed Sep 23 19:07:19 2009
+++ src/sys/dev/usb/uchcom.c Thu Nov 12 19:51:44 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: uchcom.c,v 1.8 2009/09/23 19:07:19 plunky Exp $ */
+/* $NetBSD: uchcom.c,v 1.9 2009/11/12 19:51:44 dyoung Exp $ */
/*
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uchcom.c,v 1.8 2009/09/23 19:07:19 plunky Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uchcom.c,v 1.9 2009/11/12 19:51:44 dyoung Exp $");
/*
* driver for WinChipHead CH341/340, the worst USB-serial chip in the world.
@@ -339,20 +339,15 @@
uchcom_activate(device_t self, enum devact act)
{
struct uchcom_softc *sc = device_private(self);
- int rv = 0;
switch (act) {
- case DVACT_ACTIVATE:
- rv = EOPNOTSUPP;
- break;
case DVACT_DEACTIVATE:
close_intr_pipe(sc);
sc->sc_dying = 1;
- if (sc->sc_subdev != NULL)
- rv = config_deactivate(sc->sc_subdev);
- break;
+ return 0;
+ default:
+ return EOPNOTSUPP;
}
- return rv;
}
static int
Index: src/sys/dev/usb/udsbr.c
diff -u src/sys/dev/usb/udsbr.c:1.16 src/sys/dev/usb/udsbr.c:1.17
--- src/sys/dev/usb/udsbr.c:1.16 Wed Sep 23 19:07:19 2009
+++ src/sys/dev/usb/udsbr.c Thu Nov 12 19:51:44 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: udsbr.c,v 1.16 2009/09/23 19:07:19 plunky Exp $ */
+/* $NetBSD: udsbr.c,v 1.17 2009/11/12 19:51:44 dyoung Exp $ */
/*
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: udsbr.c,v 1.16 2009/09/23 19:07:19 plunky Exp $");
+__KERNEL_RCSID(0, "$NetBSD: udsbr.c,v 1.17 2009/11/12 19:51:44 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -176,20 +176,14 @@
udsbr_activate(device_ptr_t self, enum devact act)
{
struct udsbr_softc *sc = device_private(self);
- int rv = 0;
switch (act) {
- case DVACT_ACTIVATE:
- return (EOPNOTSUPP);
- break;
-
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);
}
int
Index: src/sys/dev/usb/uep.c
diff -u src/sys/dev/usb/uep.c:1.13 src/sys/dev/usb/uep.c:1.14
--- src/sys/dev/usb/uep.c:1.13 Wed Sep 23 19:07:19 2009
+++ src/sys/dev/usb/uep.c Thu Nov 12 19:51:44 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: uep.c,v 1.13 2009/09/23 19:07:19 plunky Exp $ */
+/* $NetBSD: uep.c,v 1.14 2009/11/12 19:51:44 dyoung Exp $ */
/*
* Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uep.c,v 1.13 2009/09/23 19:07:19 plunky Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uep.c,v 1.14 2009/11/12 19:51:44 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -258,20 +258,14 @@
uep_activate(device_t self, enum devact act)
{
struct uep_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;
}
Static int
Index: src/sys/dev/usb/uftdi.c
diff -u src/sys/dev/usb/uftdi.c:1.43 src/sys/dev/usb/uftdi.c:1.44
--- src/sys/dev/usb/uftdi.c:1.43 Wed Sep 23 19:07:19 2009
+++ src/sys/dev/usb/uftdi.c Thu Nov 12 19:51:44 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: uftdi.c,v 1.43 2009/09/23 19:07:19 plunky Exp $ */
+/* $NetBSD: uftdi.c,v 1.44 2009/11/12 19:51:44 dyoung Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uftdi.c,v 1.43 2009/09/23 19:07:19 plunky Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uftdi.c,v 1.44 2009/11/12 19:51:44 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -312,20 +312,14 @@
uftdi_activate(device_t self, enum devact act)
{
struct uftdi_softc *sc = device_private(self);
- int rv = 0,i;
switch (act) {
- case DVACT_ACTIVATE:
- return (EOPNOTSUPP);
-
case DVACT_DEACTIVATE:
- for (i=0; i < sc->sc_numports; i++)
- if (sc->sc_subdev[i] != NULL)
- rv = config_deactivate(sc->sc_subdev[i]);
sc->sc_dying = 1;
- break;
+ return 0;
+ default:
+ return EOPNOTSUPP;
}
- return (rv);
}
void
Index: src/sys/dev/usb/ugensa.c
diff -u src/sys/dev/usb/ugensa.c:1.23 src/sys/dev/usb/ugensa.c:1.24
--- src/sys/dev/usb/ugensa.c:1.23 Wed Sep 23 19:07:19 2009
+++ src/sys/dev/usb/ugensa.c Thu Nov 12 19:51:44 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: ugensa.c,v 1.23 2009/09/23 19:07:19 plunky Exp $ */
+/* $NetBSD: ugensa.c,v 1.24 2009/11/12 19:51:44 dyoung Exp $ */
/*
* Copyright (c) 2004, 2005 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ugensa.c,v 1.23 2009/09/23 19:07:19 plunky Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ugensa.c,v 1.24 2009/11/12 19:51:44 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -258,22 +258,16 @@
ugensa_activate(device_t self, enum devact act)
{
struct ugensa_softc *sc = device_private(self);
- int rv = 0;
DPRINTF(("ugensa_activate: sc=%p\n", sc));
switch (act) {
- case DVACT_ACTIVATE:
- return (EOPNOTSUPP);
- break;
-
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);
}
USB_DETACH(ugensa)
