---

yaml --- r: 304407 b: refs/heads/master c: 8d05725 h: refs/heads/master i: 304405: 03d94ac 304403: ab772d3 304399: ee4f616 v: v3
git-mirror · Apr 23, 2012 · 9632ded · 9632ded
1 parent f766fcd
commit 9632ded
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 26 deletions.
diff --git 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
@@ -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");