Module Name: src
Committed By: dyoung
Date: Sun Dec 6 21:40:32 UTC 2009
Modified Files:
src/sys/dev/usb: pseye.c ubt.c ucom.c ucycom.c ugen.c uhid.c ulpt.c
urio.c uscanner.c usscanner.c utoppy.c
Log Message:
Simplify device-activation hooks.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/dev/usb/pseye.c
cvs rdiff -u -r1.37 -r1.38 src/sys/dev/usb/ubt.c
cvs rdiff -u -r1.80 -r1.81 src/sys/dev/usb/ucom.c
cvs rdiff -u -r1.29 -r1.30 src/sys/dev/usb/ucycom.c
cvs rdiff -u -r1.105 -r1.106 src/sys/dev/usb/ugen.c
cvs rdiff -u -r1.82 -r1.83 src/sys/dev/usb/uhid.c
cvs rdiff -u -r1.83 -r1.84 src/sys/dev/usb/ulpt.c
cvs rdiff -u -r1.33 -r1.34 src/sys/dev/usb/urio.c
cvs rdiff -u -r1.66 -r1.67 src/sys/dev/usb/uscanner.c
cvs rdiff -u -r1.28 -r1.29 src/sys/dev/usb/usscanner.c
cvs rdiff -u -r1.13 -r1.14 src/sys/dev/usb/utoppy.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/pseye.c
diff -u src/sys/dev/usb/pseye.c:1.14 src/sys/dev/usb/pseye.c:1.15
--- src/sys/dev/usb/pseye.c:1.14 Wed Sep 23 19:07:19 2009
+++ src/sys/dev/usb/pseye.c Sun Dec 6 21:40:31 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: pseye.c,v 1.14 2009/09/23 19:07:19 plunky Exp $ */
+/* $NetBSD: pseye.c,v 1.15 2009/12/06 21:40:31 dyoung Exp $ */
/*-
* Copyright (c) 2008 Jared D. McNeill <[email protected]>
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pseye.c,v 1.14 2009/09/23 19:07:19 plunky Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pseye.c,v 1.15 2009/12/06 21:40:31 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -309,19 +309,14 @@
pseye_activate(device_ptr_t self, enum devact act)
{
struct pseye_softc *sc = device_private(self);
- int rv;
-
- rv = 0;
switch (act) {
- case DVACT_ACTIVATE:
- break;
case DVACT_DEACTIVATE:
sc->sc_dying = 1;
- break;
+ return 0;
+ default:
+ return EOPNOTSUPP;
}
-
- return rv;
}
static void
Index: src/sys/dev/usb/ubt.c
diff -u src/sys/dev/usb/ubt.c:1.37 src/sys/dev/usb/ubt.c:1.38
--- src/sys/dev/usb/ubt.c:1.37 Wed Sep 23 19:07:19 2009
+++ src/sys/dev/usb/ubt.c Sun Dec 6 21:40:31 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: ubt.c,v 1.37 2009/09/23 19:07:19 plunky Exp $ */
+/* $NetBSD: ubt.c,v 1.38 2009/12/06 21:40:31 dyoung Exp $ */
/*-
* Copyright (c) 2006 Itronix Inc.
@@ -67,7 +67,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ubt.c,v 1.37 2009/09/23 19:07:19 plunky Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ubt.c,v 1.38 2009/12/06 21:40:31 dyoung Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -578,24 +578,16 @@
ubt_activate(device_ptr_t self, enum devact act)
{
struct ubt_softc *sc = USBGETSOFTC(self);
- int error = 0;
DPRINTFN(1, "sc=%p, act=%d\n", sc, act);
switch (act) {
- case DVACT_ACTIVATE:
- break;
-
case DVACT_DEACTIVATE:
sc->sc_dying = 1;
- break;
-
+ return 0;
default:
- error = EOPNOTSUPP;
- break;
+ return EOPNOTSUPP;
}
-
- return error;
}
/* set ISOC configuration */
Index: src/sys/dev/usb/ucom.c
diff -u src/sys/dev/usb/ucom.c:1.80 src/sys/dev/usb/ucom.c:1.81
--- src/sys/dev/usb/ucom.c:1.80 Thu Jul 30 19:57:07 2009
+++ src/sys/dev/usb/ucom.c Sun Dec 6 21:40:31 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: ucom.c,v 1.80 2009/07/30 19:57:07 skrll Exp $ */
+/* $NetBSD: ucom.c,v 1.81 2009/12/06 21:40:31 dyoung Exp $ */
/*
* Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ucom.c,v 1.80 2009/07/30 19:57:07 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ucom.c,v 1.81 2009/12/06 21:40:31 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -273,14 +273,12 @@
DPRINTFN(5,("ucom_activate: %d\n", act));
switch (act) {
- case DVACT_ACTIVATE:
- return (EOPNOTSUPP);
-
case DVACT_DEACTIVATE:
sc->sc_dying = 1;
- break;
+ return 0;
+ default:
+ return EOPNOTSUPP;
}
- return (0);
}
void
Index: src/sys/dev/usb/ucycom.c
diff -u src/sys/dev/usb/ucycom.c:1.29 src/sys/dev/usb/ucycom.c:1.30
--- src/sys/dev/usb/ucycom.c:1.29 Thu Aug 6 07:07:30 2009
+++ src/sys/dev/usb/ucycom.c Sun Dec 6 21:40:31 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: ucycom.c,v 1.29 2009/08/06 07:07:30 skrll Exp $ */
+/* $NetBSD: ucycom.c,v 1.30 2009/12/06 21:40:31 dyoung Exp $ */
/*
* Copyright (c) 2005 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ucycom.c,v 1.29 2009/08/06 07:07:30 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ucycom.c,v 1.30 2009/12/06 21:40:31 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -272,14 +272,12 @@
DPRINTFN(5,("ucycom_activate: %d\n", act));
switch (act) {
- case DVACT_ACTIVATE:
- return (EOPNOTSUPP);
-
case DVACT_DEACTIVATE:
sc->sc_dying = 1;
- break;
+ return 0;
+ default:
+ return EOPNOTSUPP;
}
- return (0);
}
#if 0
Index: src/sys/dev/usb/ugen.c
diff -u src/sys/dev/usb/ugen.c:1.105 src/sys/dev/usb/ugen.c:1.106
--- src/sys/dev/usb/ugen.c:1.105 Thu Sep 24 22:33:04 2009
+++ src/sys/dev/usb/ugen.c Sun Dec 6 21:40:31 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: ugen.c,v 1.105 2009/09/24 22:33:04 pooka Exp $ */
+/* $NetBSD: ugen.c,v 1.106 2009/12/06 21:40:31 dyoung Exp $ */
/*
* Copyright (c) 1998, 2004 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ugen.c,v 1.105 2009/09/24 22:33:04 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ugen.c,v 1.106 2009/12/06 21:40:31 dyoung Exp $");
#include "opt_ugen_bulk_ra_wb.h"
#include "opt_compat_netbsd.h"
@@ -1000,14 +1000,12 @@
struct ugen_softc *sc = device_private(self);
switch (act) {
- case DVACT_ACTIVATE:
- return (EOPNOTSUPP);
-
case DVACT_DEACTIVATE:
sc->sc_dying = 1;
- break;
+ return 0;
+ default:
+ return EOPNOTSUPP;
}
- return (0);
}
#endif
Index: src/sys/dev/usb/uhid.c
diff -u src/sys/dev/usb/uhid.c:1.82 src/sys/dev/usb/uhid.c:1.83
--- src/sys/dev/usb/uhid.c:1.82 Sat May 24 16:40:58 2008
+++ src/sys/dev/usb/uhid.c Sun Dec 6 21:40:31 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: uhid.c,v 1.82 2008/05/24 16:40:58 cube Exp $ */
+/* $NetBSD: uhid.c,v 1.83 2009/12/06 21:40:31 dyoung Exp $ */
/*
* Copyright (c) 1998, 2004, 2008 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uhid.c,v 1.82 2008/05/24 16:40:58 cube Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uhid.c,v 1.83 2009/12/06 21:40:31 dyoung Exp $");
#include "opt_compat_netbsd.h"
@@ -175,14 +175,12 @@
struct uhid_softc *sc = device_private(self);
switch (act) {
- case DVACT_ACTIVATE:
- return (EOPNOTSUPP);
-
case DVACT_DEACTIVATE:
sc->sc_dying = 1;
- break;
+ return 0;
+ default:
+ return EOPNOTSUPP;
}
- return (0);
}
int
Index: src/sys/dev/usb/ulpt.c
diff -u src/sys/dev/usb/ulpt.c:1.83 src/sys/dev/usb/ulpt.c:1.84
--- src/sys/dev/usb/ulpt.c:1.83 Wed Sep 23 19:07:19 2009
+++ src/sys/dev/usb/ulpt.c Sun Dec 6 21:40:31 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: ulpt.c,v 1.83 2009/09/23 19:07:19 plunky Exp $ */
+/* $NetBSD: ulpt.c,v 1.84 2009/12/06 21:40:31 dyoung Exp $ */
/* $FreeBSD: src/sys/dev/usb/ulpt.c,v 1.24 1999/11/17 22:33:44 n_hibma Exp $ */
/*
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ulpt.c,v 1.83 2009/09/23 19:07:19 plunky Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ulpt.c,v 1.84 2009/12/06 21:40:31 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -364,14 +364,12 @@
struct ulpt_softc *sc = device_private(self);
switch (act) {
- case DVACT_ACTIVATE:
- return (EOPNOTSUPP);
-
case DVACT_DEACTIVATE:
sc->sc_dying = 1;
- break;
+ return 0;
+ default:
+ return EOPNOTSUPP;
}
- return (0);
}
#endif
Index: src/sys/dev/usb/urio.c
diff -u src/sys/dev/usb/urio.c:1.33 src/sys/dev/usb/urio.c:1.34
--- src/sys/dev/usb/urio.c:1.33 Wed Sep 23 19:07:19 2009
+++ src/sys/dev/usb/urio.c Sun Dec 6 21:40:31 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: urio.c,v 1.33 2009/09/23 19:07:19 plunky Exp $ */
+/* $NetBSD: urio.c,v 1.34 2009/12/06 21:40:31 dyoung Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: urio.c,v 1.33 2009/09/23 19:07:19 plunky Exp $");
+__KERNEL_RCSID(0, "$NetBSD: urio.c,v 1.34 2009/12/06 21:40:31 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -290,15 +290,12 @@
struct urio_softc *sc = device_private(self);
switch (act) {
- case DVACT_ACTIVATE:
- return (EOPNOTSUPP);
- break;
-
case DVACT_DEACTIVATE:
sc->sc_dying = 1;
- break;
+ return 0;
+ default:
+ return EOPNOTSUPP;
}
- return (0);
}
#endif
Index: src/sys/dev/usb/uscanner.c
diff -u src/sys/dev/usb/uscanner.c:1.66 src/sys/dev/usb/uscanner.c:1.67
--- src/sys/dev/usb/uscanner.c:1.66 Wed Sep 23 19:07:19 2009
+++ src/sys/dev/usb/uscanner.c Sun Dec 6 21:40:31 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: uscanner.c,v 1.66 2009/09/23 19:07:19 plunky Exp $ */
+/* $NetBSD: uscanner.c,v 1.67 2009/12/06 21:40:31 dyoung Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uscanner.c,v 1.66 2009/09/23 19:07:19 plunky Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uscanner.c,v 1.67 2009/12/06 21:40:31 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -626,14 +626,12 @@
struct uscanner_softc *sc = device_private(self);
switch (act) {
- case DVACT_ACTIVATE:
- return (EOPNOTSUPP);
-
case DVACT_DEACTIVATE:
sc->sc_dying = 1;
- break;
+ return 0;
+ default:
+ return EOPNOTSUPP;
}
- return (0);
}
#endif
Index: src/sys/dev/usb/usscanner.c
diff -u src/sys/dev/usb/usscanner.c:1.28 src/sys/dev/usb/usscanner.c:1.29
--- src/sys/dev/usb/usscanner.c:1.28 Wed Sep 23 19:07:19 2009
+++ src/sys/dev/usb/usscanner.c Sun Dec 6 21:40:31 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: usscanner.c,v 1.28 2009/09/23 19:07:19 plunky Exp $ */
+/* $NetBSD: usscanner.c,v 1.29 2009/12/06 21:40:31 dyoung Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -47,7 +47,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: usscanner.c,v 1.28 2009/09/23 19:07:19 plunky Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usscanner.c,v 1.29 2009/12/06 21:40:31 dyoung Exp $");
#include "scsibus.h"
#include <sys/param.h>
@@ -413,14 +413,12 @@
struct usscanner_softc *sc = device_private(self);
switch (act) {
- case DVACT_ACTIVATE:
- return (EOPNOTSUPP);
-
case DVACT_DEACTIVATE:
sc->sc_dying = 1;
- break;
+ return 0;
+ default:
+ return EOPNOTSUPP;
}
- return (0);
}
Static void
Index: src/sys/dev/usb/utoppy.c
diff -u src/sys/dev/usb/utoppy.c:1.13 src/sys/dev/usb/utoppy.c:1.14
--- src/sys/dev/usb/utoppy.c:1.13 Wed Sep 23 19:07:19 2009
+++ src/sys/dev/usb/utoppy.c Sun Dec 6 21:40:31 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: utoppy.c,v 1.13 2009/09/23 19:07:19 plunky Exp $ */
+/* $NetBSD: utoppy.c,v 1.14 2009/12/06 21:40:31 dyoung Exp $ */
/*-
* Copyright (c) 2006 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: utoppy.c,v 1.13 2009/09/23 19:07:19 plunky Exp $");
+__KERNEL_RCSID(0, "$NetBSD: utoppy.c,v 1.14 2009/12/06 21:40:31 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -307,14 +307,12 @@
struct utoppy_softc *sc = device_private(self);
switch (act) {
- case DVACT_ACTIVATE:
- return (EOPNOTSUPP);
-
case DVACT_DEACTIVATE:
sc->sc_dying = 1;
- break;
+ return 0;
+ default:
+ return EOPNOTSUPP;
}
- return (0);
}
USB_DETACH(utoppy)
