Module Name: src
Committed By: dyoung
Date: Thu Nov 12 20:01:15 UTC 2009
Modified Files:
src/sys/dev/usb: uslsa.c ustir.c uvideo.c uvisor.c uvscom.c
xboxcontroller.c
Log Message:
Simplify activation hooks. (sc_dying must die!)
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/dev/usb/uslsa.c
cvs rdiff -u -r1.27 -r1.28 src/sys/dev/usb/ustir.c
cvs rdiff -u -r1.29 -r1.30 src/sys/dev/usb/uvideo.c
cvs rdiff -u -r1.41 -r1.42 src/sys/dev/usb/uvisor.c
cvs rdiff -u -r1.23 -r1.24 src/sys/dev/usb/uvscom.c
cvs rdiff -u -r1.11 -r1.12 src/sys/dev/usb/xboxcontroller.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/uslsa.c
diff -u src/sys/dev/usb/uslsa.c:1.10 src/sys/dev/usb/uslsa.c:1.11
--- src/sys/dev/usb/uslsa.c:1.10 Wed Sep 23 19:07:19 2009
+++ src/sys/dev/usb/uslsa.c Thu Nov 12 20:01:15 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: uslsa.c,v 1.10 2009/09/23 19:07:19 plunky Exp $ */
+/* $NetBSD: uslsa.c,v 1.11 2009/11/12 20:01:15 dyoung Exp $ */
/* from ugensa.c */
@@ -62,7 +62,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uslsa.c,v 1.10 2009/09/23 19:07:19 plunky Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uslsa.c,v 1.11 2009/11/12 20:01:15 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -327,20 +327,14 @@
uslsa_activate(device_t self, enum devact act)
{
struct uslsa_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_subdev)
- rv = config_deactivate(sc->sc_subdev);
- break;
+ return 0;
+ default:
+ return EOPNOTSUPP;
}
- return (rv);
}
void
Index: src/sys/dev/usb/ustir.c
diff -u src/sys/dev/usb/ustir.c:1.27 src/sys/dev/usb/ustir.c:1.28
--- src/sys/dev/usb/ustir.c:1.27 Wed Sep 23 19:07:19 2009
+++ src/sys/dev/usb/ustir.c Thu Nov 12 20:01:15 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: ustir.c,v 1.27 2009/09/23 19:07:19 plunky Exp $ */
+/* $NetBSD: ustir.c,v 1.28 2009/11/12 20:01:15 dyoung Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ustir.c,v 1.27 2009/09/23 19:07:19 plunky Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ustir.c,v 1.28 2009/11/12 20:01:15 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -858,19 +858,14 @@
ustir_activate(device_t self, enum devact act)
{
struct ustir_softc *sc = device_private(self);
- int error = 0;
switch (act) {
- case DVACT_ACTIVATE:
- return EOPNOTSUPP;
-
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;
}
/* ARGSUSED */
Index: src/sys/dev/usb/uvideo.c
diff -u src/sys/dev/usb/uvideo.c:1.29 src/sys/dev/usb/uvideo.c:1.30
--- src/sys/dev/usb/uvideo.c:1.29 Mon Mar 9 15:59:33 2009
+++ src/sys/dev/usb/uvideo.c Thu Nov 12 20:01:15 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: uvideo.c,v 1.29 2009/03/09 15:59:33 uebayasi Exp $ */
+/* $NetBSD: uvideo.c,v 1.30 2009/11/12 20:01:15 dyoung Exp $ */
/*
* Copyright (c) 2008 Patrick Mahoney
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvideo.c,v 1.29 2009/03/09 15:59:33 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvideo.c,v 1.30 2009/11/12 20:01:15 dyoung Exp $");
#ifdef _MODULE
#include <sys/module.h>
@@ -622,23 +622,16 @@
int
uvideo_activate(device_t self, enum devact act)
{
- struct uvideo_softc *sc;
- int rv;
+ struct uvideo_softc *sc = device_private(self);
- sc = device_private(self);
- rv = 0;
switch (act) {
- case DVACT_ACTIVATE:
- return EOPNOTSUPP;
-
case DVACT_DEACTIVATE:
DPRINTF(("uvideo_activate: deactivating\n"));
- if (sc->sc_videodev != NULL)
- rv = config_deactivate(sc->sc_videodev);
sc->sc_dying = 1;
- break;
+ return 0;
+ default:
+ return EOPNOTSUPP;
}
- return rv;
}
Index: src/sys/dev/usb/uvisor.c
diff -u src/sys/dev/usb/uvisor.c:1.41 src/sys/dev/usb/uvisor.c:1.42
--- src/sys/dev/usb/uvisor.c:1.41 Wed Sep 23 19:07:19 2009
+++ src/sys/dev/usb/uvisor.c Thu Nov 12 20:01:15 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: uvisor.c,v 1.41 2009/09/23 19:07:19 plunky Exp $ */
+/* $NetBSD: uvisor.c,v 1.42 2009/11/12 20:01:15 dyoung Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvisor.c,v 1.41 2009/09/23 19:07:19 plunky Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvisor.c,v 1.42 2009/11/12 20:01:15 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -377,22 +377,14 @@
uvisor_activate(device_ptr_t self, enum devact act)
{
struct uvisor_softc *sc = device_private(self);
- int rv = 0;
- int i;
switch (act) {
- case DVACT_ACTIVATE:
- return (EOPNOTSUPP);
- break;
-
case DVACT_DEACTIVATE:
- for (i = 0; i < sc->sc_numcon; 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);
}
void
Index: src/sys/dev/usb/uvscom.c
diff -u src/sys/dev/usb/uvscom.c:1.23 src/sys/dev/usb/uvscom.c:1.24
--- src/sys/dev/usb/uvscom.c:1.23 Wed Sep 23 19:07:19 2009
+++ src/sys/dev/usb/uvscom.c Thu Nov 12 20:01:15 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: uvscom.c,v 1.23 2009/09/23 19:07:19 plunky Exp $ */
+/* $NetBSD: uvscom.c,v 1.24 2009/11/12 20:01:15 dyoung Exp $ */
/*-
* Copyright (c) 2001-2002, Shunsuke Akiyama <akiy...@jp.freebsd.org>.
* All rights reserved.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvscom.c,v 1.23 2009/09/23 19:07:19 plunky Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvscom.c,v 1.24 2009/11/12 20:01:15 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -425,19 +425,14 @@
uvscom_activate(device_t self, enum devact act)
{
struct uvscom_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);
}
Static usbd_status
Index: src/sys/dev/usb/xboxcontroller.c
diff -u src/sys/dev/usb/xboxcontroller.c:1.11 src/sys/dev/usb/xboxcontroller.c:1.12
--- src/sys/dev/usb/xboxcontroller.c:1.11 Wed Sep 23 19:07:19 2009
+++ src/sys/dev/usb/xboxcontroller.c Thu Nov 12 20:01:15 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: xboxcontroller.c,v 1.11 2009/09/23 19:07:19 plunky Exp $ */
+/* $NetBSD: xboxcontroller.c,v 1.12 2009/11/12 20:01:15 dyoung Exp $ */
/*-
* Copyright (c) 2007 Jared D. McNeill <jmcne...@invisible.ca>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xboxcontroller.c,v 1.11 2009/09/23 19:07:19 plunky Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xboxcontroller.c,v 1.12 2009/11/12 20:01:15 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -195,21 +195,14 @@
xboxcontroller_activate(device_ptr_t self, enum devact act)
{
struct xboxcontroller_softc *sc = device_private(self);
- int rv;
-
- 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 void
