From owner-svn-src-all@FreeBSD.ORG Thu Oct 9 20:51:28 2008 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0CA9510656A9; Thu, 9 Oct 2008 20:51:26 +0000 (UTC) (envelope-from n_hibma@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id DFF9D8FC12; Thu, 9 Oct 2008 20:51:25 +0000 (UTC) (envelope-from n_hibma@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id m99KpPns071324; Thu, 9 Oct 2008 20:51:25 GMT (envelope-from n_hibma@svn.freebsd.org) Received: (from n_hibma@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id m99KpP3W071320; Thu, 9 Oct 2008 20:51:25 GMT (envelope-from n_hibma@svn.freebsd.org) Message-Id: <200810092051.m99KpP3W071320@svn.freebsd.org> From: Nick Hibma Date: Thu, 9 Oct 2008 20:51:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r183734 - head/sys/dev/usb X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Oct 2008 20:51:28 -0000 Author: n_hibma Date: Thu Oct 9 20:51:25 2008 New Revision: 183734 URL: http://svn.freebsd.org/changeset/base/183734 Log: uark/ucom: Minor code cleanup. umass; Remove duplicated code. ukbd: Fill in the arg parameter on the through call. Modified: head/sys/dev/usb/uark.c head/sys/dev/usb/ucom.c head/sys/dev/usb/ukbd.c head/sys/dev/usb/umass.c Modified: head/sys/dev/usb/uark.c ============================================================================== --- head/sys/dev/usb/uark.c Thu Oct 9 20:43:42 2008 (r183733) +++ head/sys/dev/usb/uark.c Thu Oct 9 20:51:25 2008 (r183734) @@ -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; } Modified: head/sys/dev/usb/ucom.c ============================================================================== --- head/sys/dev/usb/ucom.c Thu Oct 9 20:43:42 2008 (r183733) +++ head/sys/dev/usb/ucom.c Thu Oct 9 20:51:25 2008 (r183734) @@ -161,14 +161,11 @@ ucom_modevent(module_t mod, int type, vo { switch (type) { case MOD_LOAD: - break; case MOD_UNLOAD: - break; + return (0); default: return (EOPNOTSUPP); - break; } - return (0); } void Modified: head/sys/dev/usb/ukbd.c ============================================================================== --- head/sys/dev/usb/ukbd.c Thu Oct 9 20:43:42 2008 (r183733) +++ head/sys/dev/usb/ukbd.c Thu Oct 9 20:51:25 2008 (r183734) @@ -1534,5 +1534,5 @@ ukbd_driver_load(module_t mod, int what, kbd_delete_driver(&ukbd_kbd_driver); break; } - return usbd_driver_load(mod, what, 0); + return usbd_driver_load(mod, what, arg); } Modified: head/sys/dev/usb/umass.c ============================================================================== --- head/sys/dev/usb/umass.c Thu Oct 9 20:43:42 2008 (r183733) +++ head/sys/dev/usb/umass.c Thu Oct 9 20:51:25 2008 (r183734) @@ -3291,17 +3291,6 @@ umass_cam_quirk_cb(struct umass_softc *s 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 /* (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);