From 9632dedf4669dfb8904507e2750dfb6c5a90ecb9 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 23 Apr 2012 16:33:52 -0700 Subject: [PATCH] --- yaml --- r: 304407 b: refs/heads/master c: 8d0572504802742ae21f1aaa499478c4e23bd4ef h: refs/heads/master i: 304405: 03d94accbf73bf4e6a46fe84ac4fd845dc3e0842 304403: ab772d36e4b8ae3078b46d7972d3b6c1143059dd 304399: ee4f616565b48490e9facf5b92c127b1f13d8fb2 v: v3 --- [refs] | 2 +- .../staging/media/go7007/s2250-loader.c | 26 +------------------ 2 files changed, 2 insertions(+), 26 deletions(-) diff --git a/[refs] b/[refs] index b94b09fe3df8..7bc633807413 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4a6313644c3188f4aa1a6b4403896375baa2e09a +refs/heads/master: 8d0572504802742ae21f1aaa499478c4e23bd4ef diff --git a/trunk/drivers/staging/media/go7007/s2250-loader.c b/trunk/drivers/staging/media/go7007/s2250-loader.c index 4e132519e253..7c5af4f289b6 100644 --- a/trunk/drivers/staging/media/go7007/s2250-loader.c +++ b/trunk/drivers/staging/media/go7007/s2250-loader.c @@ -160,31 +160,7 @@ static struct usb_driver s2250loader_driver = { .id_table = s2250loader_ids, }; -static int __init s2250loader_init(void) -{ - int r; - unsigned i = 0; - - for (i = 0; i < MAX_DEVICES; i++) - s2250_dev_table[i] = NULL; - - r = usb_register(&s2250loader_driver); - if (r) { - printk(KERN_ERR "usb_register failed. Error number %d\n", r); - return -1; - } - - printk(KERN_INFO "s2250loader_init: driver registered\n"); - return 0; -} -module_init(s2250loader_init); - -static void __exit s2250loader_cleanup(void) -{ - printk(KERN_INFO "s2250loader_cleanup\n"); - usb_deregister(&s2250loader_driver); -} -module_exit(s2250loader_cleanup); +module_usb_driver(s2250loader_driver); MODULE_AUTHOR(""); MODULE_DESCRIPTION("firmware loader for Sensoray 2250/2251");