diff options
author | n_hibma <n_hibma@FreeBSD.org> | 2008-10-09 20:51:25 +0000 |
---|---|---|
committer | n_hibma <n_hibma@FreeBSD.org> | 2008-10-09 20:51:25 +0000 |
commit | 952a69a4c81ad852111260496bccd3edde38e4d8 (patch) | |
tree | 8869d8350d92e2d17be1fb8ecc70feb600518119 /sys/dev/usb | |
parent | 6df01a7e50b9b7229975ff4b4c8cfb19e4a3f924 (diff) | |
download | FreeBSD-src-952a69a4c81ad852111260496bccd3edde38e4d8.zip FreeBSD-src-952a69a4c81ad852111260496bccd3edde38e4d8.tar.gz |
uark/ucom: Minor code cleanup.
umass; Remove duplicated code.
ukbd: Fill in the arg parameter on the through call.
Diffstat (limited to 'sys/dev/usb')
-rw-r--r-- | sys/dev/usb/uark.c | 2 | ||||
-rw-r--r-- | sys/dev/usb/ucom.c | 5 | ||||
-rw-r--r-- | sys/dev/usb/ukbd.c | 2 | ||||
-rw-r--r-- | sys/dev/usb/umass.c | 13 |
4 files changed, 4 insertions, 18 deletions
diff --git a/sys/dev/usb/uark.c b/sys/dev/usb/uark.c index 38cd07a..af85819 100644 --- a/sys/dev/usb/uark.c +++ b/sys/dev/usb/uark.c @@ -185,7 +185,7 @@ uark_attach(device_t self) return 0; bad: - DPRINTF(("uftdi_attach: ATTACH ERROR\n")); + DPRINTF(("uark_attach: ATTACH ERROR\n")); ucom->sc_dying = 1; return ENXIO; } diff --git a/sys/dev/usb/ucom.c b/sys/dev/usb/ucom.c index 04efc27..2fe60e8 100644 --- a/sys/dev/usb/ucom.c +++ b/sys/dev/usb/ucom.c @@ -161,14 +161,11 @@ ucom_modevent(module_t mod, int type, void *data) { switch (type) { case MOD_LOAD: - break; case MOD_UNLOAD: - break; + return (0); default: return (EOPNOTSUPP); - break; } - return (0); } void diff --git a/sys/dev/usb/ukbd.c b/sys/dev/usb/ukbd.c index 01efc7f..5a7c9fc 100644 --- a/sys/dev/usb/ukbd.c +++ b/sys/dev/usb/ukbd.c @@ -1534,5 +1534,5 @@ ukbd_driver_load(module_t mod, int what, void *arg) kbd_delete_driver(&ukbd_kbd_driver); break; } - return usbd_driver_load(mod, what, 0); + return usbd_driver_load(mod, what, arg); } diff --git a/sys/dev/usb/umass.c b/sys/dev/usb/umass.c index 0fdce5a..2cf64e0 100644 --- a/sys/dev/usb/umass.c +++ b/sys/dev/usb/umass.c @@ -3291,17 +3291,6 @@ umass_cam_quirk_cb(struct umass_softc *sc, void *priv, int residue, int status) xpt_done(ccb); } -static int -umass_driver_load(module_t mod, int what, void *arg) -{ - switch (what) { - case MOD_UNLOAD: - case MOD_LOAD: - default: - return(usbd_driver_load(mod, what, arg)); - } -} - /* * SCSI specific functions */ @@ -3541,7 +3530,7 @@ umass_atapi_transform(struct umass_softc *sc, unsigned char *cmd, int cmdlen, /* (even the comment is missing) */ -DRIVER_MODULE(umass, uhub, umass_driver, umass_devclass, umass_driver_load, 0); +DRIVER_MODULE(umass, uhub, umass_driver, umass_devclass, usbd_driver_load, 0); |