diff options
| author | Greg Kroah-Hartman <[email protected]> | 2011-11-18 17:44:20 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <[email protected]> | 2011-11-18 17:44:20 +0000 |
| commit | d632eb1bf22e11def74e4e53cc47d790fbdba105 (patch) | |
| tree | 3cc5f929264ac1c3cffd9646f8ebdaf4e5a9fd33 /drivers/net/usb/cdc_ether.c | |
| parent | USB: convert drivers/staging/* to use module_usb_driver() (diff) | |
| download | kernel-d632eb1bf22e11def74e4e53cc47d790fbdba105.tar.gz kernel-d632eb1bf22e11def74e4e53cc47d790fbdba105.zip | |
USB: convert drivers/net/* to use module_usb_driver()
This converts the drivers in drivers/net/* to use the
module_usb_driver() macro which makes the code smaller and a bit
simpler.
Added bonus is that it removes some unneeded kernel log messages about
drivers loading and/or unloading.
Cc: Wolfgang Grandegger <[email protected]>
Cc: Samuel Ortiz <[email protected]>
Cc: Oliver Neukum <[email protected]>
Cc: Peter Korsgaard <[email protected]>
Cc: Petko Manolov <[email protected]>
Cc: Steve Glendinning <[email protected]>
Cc: Christian Lamparter <[email protected]>
Cc: "John W. Linville" <[email protected]>
Cc: Dan Williams <[email protected]>
Cc: Jussi Kivilinna <[email protected]>
Cc: Ivo van Doorn <[email protected]>
Cc: Gertjan van Wingerde <[email protected]>
Cc: Helmut Schaa <[email protected]>
Cc: Herton Ronaldo Krzesinski <[email protected]>
Cc: Hin-Tak Leung <[email protected]>
Cc: Larry Finger <[email protected]>
Cc: Chaoming Li <[email protected]>
Cc: Lucas De Marchi <[email protected]>
Cc: "David S. Miller" <[email protected]>
Cc: Roel Kluin <[email protected]>
Cc: Paul Gortmaker <[email protected]>
Cc: Jiri Pirko <[email protected]>
Cc: Pavel Roskin <[email protected]>
Cc: Yoann DI-RUZZA <[email protected]>
Cc: George <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
Diffstat (limited to 'drivers/net/usb/cdc_ether.c')
| -rw-r--r-- | drivers/net/usb/cdc_ether.c | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/drivers/net/usb/cdc_ether.c b/drivers/net/usb/cdc_ether.c index c924ea2bce07..26637c354299 100644 --- a/drivers/net/usb/cdc_ether.c +++ b/drivers/net/usb/cdc_ether.c @@ -425,6 +425,9 @@ int usbnet_cdc_bind(struct usbnet *dev, struct usb_interface *intf) int status; struct cdc_state *info = (void *) &dev->data; + BUILD_BUG_ON((sizeof(((struct usbnet *)0)->data) + < sizeof(struct cdc_state))); + status = usbnet_generic_cdc_bind(dev, intf); if (status < 0) return status; @@ -615,21 +618,7 @@ static struct usb_driver cdc_driver = { .supports_autosuspend = 1, }; - -static int __init cdc_init(void) -{ - BUILD_BUG_ON((sizeof(((struct usbnet *)0)->data) - < sizeof(struct cdc_state))); - - return usb_register(&cdc_driver); -} -module_init(cdc_init); - -static void __exit cdc_exit(void) -{ - usb_deregister(&cdc_driver); -} -module_exit(cdc_exit); +module_usb_driver(cdc_driver); MODULE_AUTHOR("David Brownell"); MODULE_DESCRIPTION("USB CDC Ethernet devices"); |
