aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-François Moine <moinejf@free.fr>2010-09-13 03:53:03 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-10-20 23:05:52 -0400
commit548264375b1c0d51b418bf7ab6d2fec647307ab7 (patch)
tree7c3ba4523a1a17118929f38b04be295ed0f9d377
parented19a5db7826a150f0746123b23ac5cb0b2621f8 (diff)
V4L/DVB: gspca - all modules: Remove useless module load/unload messages
Signed-off-by: Jean-François Moine <moinejf@free.fr> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--drivers/media/video/gspca/conex.c8
-rw-r--r--drivers/media/video/gspca/cpia1.c8
-rw-r--r--drivers/media/video/gspca/etoms.c8
-rw-r--r--drivers/media/video/gspca/finepix.c9
-rw-r--r--drivers/media/video/gspca/gl860/gl860.c3
-rw-r--r--drivers/media/video/gspca/gspca.c3
-rw-r--r--drivers/media/video/gspca/jeilinj.c9
-rw-r--r--drivers/media/video/gspca/konica.c9
-rw-r--r--drivers/media/video/gspca/m5602/m5602_core.c8
-rw-r--r--drivers/media/video/gspca/mars.c9
-rw-r--r--drivers/media/video/gspca/mr97310a.c9
-rw-r--r--drivers/media/video/gspca/ov519.c8
-rw-r--r--drivers/media/video/gspca/ov534.c9
-rw-r--r--drivers/media/video/gspca/ov534_9.c9
-rw-r--r--drivers/media/video/gspca/pac207.c8
-rw-r--r--drivers/media/video/gspca/pac7302.c8
-rw-r--r--drivers/media/video/gspca/pac7311.c8
-rw-r--r--drivers/media/video/gspca/sn9c2028.c9
-rw-r--r--drivers/media/video/gspca/sn9c20x.c8
-rw-r--r--drivers/media/video/gspca/sonixb.c8
-rw-r--r--drivers/media/video/gspca/sonixj.c8
-rw-r--r--drivers/media/video/gspca/spca1528.c9
-rw-r--r--drivers/media/video/gspca/spca500.c8
-rw-r--r--drivers/media/video/gspca/spca501.c8
-rw-r--r--drivers/media/video/gspca/spca505.c9
-rw-r--r--drivers/media/video/gspca/spca508.c9
-rw-r--r--drivers/media/video/gspca/spca561.c8
-rw-r--r--drivers/media/video/gspca/sq905.c9
-rw-r--r--drivers/media/video/gspca/sq905c.c9
-rw-r--r--drivers/media/video/gspca/sq930x.c9
-rw-r--r--drivers/media/video/gspca/stk014.c8
-rw-r--r--drivers/media/video/gspca/stv0680.c8
-rw-r--r--drivers/media/video/gspca/stv06xx/stv06xx.c8
-rw-r--r--drivers/media/video/gspca/sunplus.c8
-rw-r--r--drivers/media/video/gspca/t613.c8
-rw-r--r--drivers/media/video/gspca/tv8532.c8
-rw-r--r--drivers/media/video/gspca/vc032x.c9
-rw-r--r--drivers/media/video/gspca/xirlink_cit.c8
-rw-r--r--drivers/media/video/gspca/zc3xx.c8
39 files changed, 38 insertions, 279 deletions
diff --git a/drivers/media/video/gspca/conex.c b/drivers/media/video/gspca/conex.c
index d6a75772f3f8..370a17792376 100644
--- a/drivers/media/video/gspca/conex.c
+++ b/drivers/media/video/gspca/conex.c
@@ -1068,17 +1068,11 @@ static struct usb_driver sd_driver = {
1068/* -- module insert / remove -- */ 1068/* -- module insert / remove -- */
1069static int __init sd_mod_init(void) 1069static int __init sd_mod_init(void)
1070{ 1070{
1071 int ret; 1071 return usb_register(&sd_driver);
1072 ret = usb_register(&sd_driver);
1073 if (ret < 0)
1074 return ret;
1075 PDEBUG(D_PROBE, "registered");
1076 return 0;
1077} 1072}
1078static void __exit sd_mod_exit(void) 1073static void __exit sd_mod_exit(void)
1079{ 1074{
1080 usb_deregister(&sd_driver); 1075 usb_deregister(&sd_driver);
1081 PDEBUG(D_PROBE, "deregistered");
1082} 1076}
1083 1077
1084module_init(sd_mod_init); 1078module_init(sd_mod_init);
diff --git a/drivers/media/video/gspca/cpia1.c b/drivers/media/video/gspca/cpia1.c
index b278186ea6d1..696f2c3ae317 100644
--- a/drivers/media/video/gspca/cpia1.c
+++ b/drivers/media/video/gspca/cpia1.c
@@ -2004,17 +2004,11 @@ static struct usb_driver sd_driver = {
2004/* -- module insert / remove -- */ 2004/* -- module insert / remove -- */
2005static int __init sd_mod_init(void) 2005static int __init sd_mod_init(void)
2006{ 2006{
2007 int ret; 2007 return usb_register(&sd_driver);
2008 ret = usb_register(&sd_driver);
2009 if (ret < 0)
2010 return ret;
2011 PDEBUG(D_PROBE, "registered");
2012 return 0;
2013} 2008}
2014static void __exit sd_mod_exit(void) 2009static void __exit sd_mod_exit(void)
2015{ 2010{
2016 usb_deregister(&sd_driver); 2011 usb_deregister(&sd_driver);
2017 PDEBUG(D_PROBE, "deregistered");
2018} 2012}
2019 2013
2020module_init(sd_mod_init); 2014module_init(sd_mod_init);
diff --git a/drivers/media/video/gspca/etoms.c b/drivers/media/video/gspca/etoms.c
index ecd4d743d2bc..ff7e509f943b 100644
--- a/drivers/media/video/gspca/etoms.c
+++ b/drivers/media/video/gspca/etoms.c
@@ -896,18 +896,12 @@ static struct usb_driver sd_driver = {
896/* -- module insert / remove -- */ 896/* -- module insert / remove -- */
897static int __init sd_mod_init(void) 897static int __init sd_mod_init(void)
898{ 898{
899 int ret; 899 return usb_register(&sd_driver);
900 ret = usb_register(&sd_driver);
901 if (ret < 0)
902 return ret;
903 PDEBUG(D_PROBE, "registered");
904 return 0;
905} 900}
906 901
907static void __exit sd_mod_exit(void) 902static void __exit sd_mod_exit(void)
908{ 903{
909 usb_deregister(&sd_driver); 904 usb_deregister(&sd_driver);
910 PDEBUG(D_PROBE, "deregistered");
911} 905}
912 906
913module_init(sd_mod_init); 907module_init(sd_mod_init);
diff --git a/drivers/media/video/gspca/finepix.c b/drivers/media/video/gspca/finepix.c
index 5d90e7448579..9b915ae50eb7 100644
--- a/drivers/media/video/gspca/finepix.c
+++ b/drivers/media/video/gspca/finepix.c
@@ -291,19 +291,12 @@ static struct usb_driver sd_driver = {
291/* -- module insert / remove -- */ 291/* -- module insert / remove -- */
292static int __init sd_mod_init(void) 292static int __init sd_mod_init(void)
293{ 293{
294 int ret; 294 return usb_register(&sd_driver);
295
296 ret = usb_register(&sd_driver);
297 if (ret < 0)
298 return ret;
299 PDEBUG(D_PROBE, "registered");
300 return 0;
301} 295}
302 296
303static void __exit sd_mod_exit(void) 297static void __exit sd_mod_exit(void)
304{ 298{
305 usb_deregister(&sd_driver); 299 usb_deregister(&sd_driver);
306 PDEBUG(D_PROBE, "deregistered");
307} 300}
308 301
309module_init(sd_mod_init); 302module_init(sd_mod_init);
diff --git a/drivers/media/video/gspca/gl860/gl860.c b/drivers/media/video/gspca/gl860/gl860.c
index e86eb8b4aedc..04bc805fb176 100644
--- a/drivers/media/video/gspca/gl860/gl860.c
+++ b/drivers/media/video/gspca/gl860/gl860.c
@@ -540,15 +540,12 @@ static int __init sd_mod_init(void)
540 540
541 if (usb_register(&sd_driver) < 0) 541 if (usb_register(&sd_driver) < 0)
542 return -1; 542 return -1;
543 PDEBUG(D_PROBE, "driver registered");
544
545 return 0; 543 return 0;
546} 544}
547 545
548static void __exit sd_mod_exit(void) 546static void __exit sd_mod_exit(void)
549{ 547{
550 usb_deregister(&sd_driver); 548 usb_deregister(&sd_driver);
551 PDEBUG(D_PROBE, "driver deregistered");
552} 549}
553 550
554module_init(sd_mod_init); 551module_init(sd_mod_init);
diff --git a/drivers/media/video/gspca/gspca.c b/drivers/media/video/gspca/gspca.c
index 78abc1c1f9d5..4609f0e38930 100644
--- a/drivers/media/video/gspca/gspca.c
+++ b/drivers/media/video/gspca/gspca.c
@@ -2428,7 +2428,7 @@ EXPORT_SYMBOL(gspca_auto_gain_n_exposure);
2428/* -- module insert / remove -- */ 2428/* -- module insert / remove -- */
2429static int __init gspca_init(void) 2429static int __init gspca_init(void)
2430{ 2430{
2431 info("main v%d.%d.%d registered", 2431 info("v%d.%d.%d registered",
2432 (DRIVER_VERSION_NUMBER >> 16) & 0xff, 2432 (DRIVER_VERSION_NUMBER >> 16) & 0xff,
2433 (DRIVER_VERSION_NUMBER >> 8) & 0xff, 2433 (DRIVER_VERSION_NUMBER >> 8) & 0xff,
2434 DRIVER_VERSION_NUMBER & 0xff); 2434 DRIVER_VERSION_NUMBER & 0xff);
@@ -2436,7 +2436,6 @@ static int __init gspca_init(void)
2436} 2436}
2437static void __exit gspca_exit(void) 2437static void __exit gspca_exit(void)
2438{ 2438{
2439 info("main deregistered");
2440} 2439}
2441 2440
2442module_init(gspca_init); 2441module_init(gspca_init);
diff --git a/drivers/media/video/gspca/jeilinj.c b/drivers/media/video/gspca/jeilinj.c
index 12d9cf4caba2..c468af5245c2 100644
--- a/drivers/media/video/gspca/jeilinj.c
+++ b/drivers/media/video/gspca/jeilinj.c
@@ -354,19 +354,12 @@ static struct usb_driver sd_driver = {
354/* -- module insert / remove -- */ 354/* -- module insert / remove -- */
355static int __init sd_mod_init(void) 355static int __init sd_mod_init(void)
356{ 356{
357 int ret; 357 return usb_register(&sd_driver);
358
359 ret = usb_register(&sd_driver);
360 if (ret < 0)
361 return ret;
362 PDEBUG(D_PROBE, "registered");
363 return 0;
364} 358}
365 359
366static void __exit sd_mod_exit(void) 360static void __exit sd_mod_exit(void)
367{ 361{
368 usb_deregister(&sd_driver); 362 usb_deregister(&sd_driver);
369 PDEBUG(D_PROBE, "deregistered");
370} 363}
371 364
372module_init(sd_mod_init); 365module_init(sd_mod_init);
diff --git a/drivers/media/video/gspca/konica.c b/drivers/media/video/gspca/konica.c
index 3de67ee5c230..3a07096e7088 100644
--- a/drivers/media/video/gspca/konica.c
+++ b/drivers/media/video/gspca/konica.c
@@ -635,18 +635,11 @@ static struct usb_driver sd_driver = {
635/* -- module insert / remove -- */ 635/* -- module insert / remove -- */
636static int __init sd_mod_init(void) 636static int __init sd_mod_init(void)
637{ 637{
638 int ret; 638 return usb_register(&sd_driver);
639
640 ret = usb_register(&sd_driver);
641 if (ret < 0)
642 return ret;
643 info("registered");
644 return 0;
645} 639}
646static void __exit sd_mod_exit(void) 640static void __exit sd_mod_exit(void)
647{ 641{
648 usb_deregister(&sd_driver); 642 usb_deregister(&sd_driver);
649 info("deregistered");
650} 643}
651 644
652module_init(sd_mod_init); 645module_init(sd_mod_init);
diff --git a/drivers/media/video/gspca/m5602/m5602_core.c b/drivers/media/video/gspca/m5602/m5602_core.c
index b073d66acd04..c872b93a3351 100644
--- a/drivers/media/video/gspca/m5602/m5602_core.c
+++ b/drivers/media/video/gspca/m5602/m5602_core.c
@@ -406,18 +406,12 @@ static struct usb_driver sd_driver = {
406/* -- module insert / remove -- */ 406/* -- module insert / remove -- */
407static int __init mod_m5602_init(void) 407static int __init mod_m5602_init(void)
408{ 408{
409 int ret; 409 return usb_register(&sd_driver);
410 ret = usb_register(&sd_driver);
411 if (ret < 0)
412 return ret;
413 PDEBUG(D_PROBE, "registered");
414 return 0;
415} 410}
416 411
417static void __exit mod_m5602_exit(void) 412static void __exit mod_m5602_exit(void)
418{ 413{
419 usb_deregister(&sd_driver); 414 usb_deregister(&sd_driver);
420 PDEBUG(D_PROBE, "deregistered");
421} 415}
422 416
423module_init(mod_m5602_init); 417module_init(mod_m5602_init);
diff --git a/drivers/media/video/gspca/mars.c b/drivers/media/video/gspca/mars.c
index 031f7195ce0d..e21172ef9dee 100644
--- a/drivers/media/video/gspca/mars.c
+++ b/drivers/media/video/gspca/mars.c
@@ -510,18 +510,11 @@ static struct usb_driver sd_driver = {
510/* -- module insert / remove -- */ 510/* -- module insert / remove -- */
511static int __init sd_mod_init(void) 511static int __init sd_mod_init(void)
512{ 512{
513 int ret; 513 return usb_register(&sd_driver);
514
515 ret = usb_register(&sd_driver);
516 if (ret < 0)
517 return ret;
518 PDEBUG(D_PROBE, "registered");
519 return 0;
520} 514}
521static void __exit sd_mod_exit(void) 515static void __exit sd_mod_exit(void)
522{ 516{
523 usb_deregister(&sd_driver); 517 usb_deregister(&sd_driver);
524 PDEBUG(D_PROBE, "deregistered");
525} 518}
526 519
527module_init(sd_mod_init); 520module_init(sd_mod_init);
diff --git a/drivers/media/video/gspca/mr97310a.c b/drivers/media/video/gspca/mr97310a.c
index ccedf23300d4..f325b6772515 100644
--- a/drivers/media/video/gspca/mr97310a.c
+++ b/drivers/media/video/gspca/mr97310a.c
@@ -1261,18 +1261,11 @@ static struct usb_driver sd_driver = {
1261/* -- module insert / remove -- */ 1261/* -- module insert / remove -- */
1262static int __init sd_mod_init(void) 1262static int __init sd_mod_init(void)
1263{ 1263{
1264 int ret; 1264 return usb_register(&sd_driver);
1265
1266 ret = usb_register(&sd_driver);
1267 if (ret < 0)
1268 return ret;
1269 PDEBUG(D_PROBE, "registered");
1270 return 0;
1271} 1265}
1272static void __exit sd_mod_exit(void) 1266static void __exit sd_mod_exit(void)
1273{ 1267{
1274 usb_deregister(&sd_driver); 1268 usb_deregister(&sd_driver);
1275 PDEBUG(D_PROBE, "deregistered");
1276} 1269}
1277 1270
1278module_init(sd_mod_init); 1271module_init(sd_mod_init);
diff --git a/drivers/media/video/gspca/ov519.c b/drivers/media/video/gspca/ov519.c
index 2b2cbdbf03fe..a8ac24a7af8e 100644
--- a/drivers/media/video/gspca/ov519.c
+++ b/drivers/media/video/gspca/ov519.c
@@ -4663,17 +4663,11 @@ static struct usb_driver sd_driver = {
4663/* -- module insert / remove -- */ 4663/* -- module insert / remove -- */
4664static int __init sd_mod_init(void) 4664static int __init sd_mod_init(void)
4665{ 4665{
4666 int ret; 4666 return usb_register(&sd_driver);
4667 ret = usb_register(&sd_driver);
4668 if (ret < 0)
4669 return ret;
4670 PDEBUG(D_PROBE, "registered");
4671 return 0;
4672} 4667}
4673static void __exit sd_mod_exit(void) 4668static void __exit sd_mod_exit(void)
4674{ 4669{
4675 usb_deregister(&sd_driver); 4670 usb_deregister(&sd_driver);
4676 PDEBUG(D_PROBE, "deregistered");
4677} 4671}
4678 4672
4679module_init(sd_mod_init); 4673module_init(sd_mod_init);
diff --git a/drivers/media/video/gspca/ov534.c b/drivers/media/video/gspca/ov534.c
index 96cb3a976581..b6ed9d0956a0 100644
--- a/drivers/media/video/gspca/ov534.c
+++ b/drivers/media/video/gspca/ov534.c
@@ -1327,19 +1327,12 @@ static struct usb_driver sd_driver = {
1327/* -- module insert / remove -- */ 1327/* -- module insert / remove -- */
1328static int __init sd_mod_init(void) 1328static int __init sd_mod_init(void)
1329{ 1329{
1330 int ret; 1330 return usb_register(&sd_driver);
1331
1332 ret = usb_register(&sd_driver);
1333 if (ret < 0)
1334 return ret;
1335 PDEBUG(D_PROBE, "registered");
1336 return 0;
1337} 1331}
1338 1332
1339static void __exit sd_mod_exit(void) 1333static void __exit sd_mod_exit(void)
1340{ 1334{
1341 usb_deregister(&sd_driver); 1335 usb_deregister(&sd_driver);
1342 PDEBUG(D_PROBE, "deregistered");
1343} 1336}
1344 1337
1345module_init(sd_mod_init); 1338module_init(sd_mod_init);
diff --git a/drivers/media/video/gspca/ov534_9.c b/drivers/media/video/gspca/ov534_9.c
index bbe5a030e3b4..59e50df2dbdd 100644
--- a/drivers/media/video/gspca/ov534_9.c
+++ b/drivers/media/video/gspca/ov534_9.c
@@ -1458,19 +1458,12 @@ static struct usb_driver sd_driver = {
1458/* -- module insert / remove -- */ 1458/* -- module insert / remove -- */
1459static int __init sd_mod_init(void) 1459static int __init sd_mod_init(void)
1460{ 1460{
1461 int ret; 1461 return usb_register(&sd_driver);
1462
1463 ret = usb_register(&sd_driver);
1464 if (ret < 0)
1465 return ret;
1466 PDEBUG(D_PROBE, "registered");
1467 return 0;
1468} 1462}
1469 1463
1470static void __exit sd_mod_exit(void) 1464static void __exit sd_mod_exit(void)
1471{ 1465{
1472 usb_deregister(&sd_driver); 1466 usb_deregister(&sd_driver);
1473 PDEBUG(D_PROBE, "deregistered");
1474} 1467}
1475 1468
1476module_init(sd_mod_init); 1469module_init(sd_mod_init);
diff --git a/drivers/media/video/gspca/pac207.c b/drivers/media/video/gspca/pac207.c
index 25671a6f3eec..8c711dfb3902 100644
--- a/drivers/media/video/gspca/pac207.c
+++ b/drivers/media/video/gspca/pac207.c
@@ -572,17 +572,11 @@ static struct usb_driver sd_driver = {
572/* -- module insert / remove -- */ 572/* -- module insert / remove -- */
573static int __init sd_mod_init(void) 573static int __init sd_mod_init(void)
574{ 574{
575 int ret; 575 return usb_register(&sd_driver);
576 ret = usb_register(&sd_driver);
577 if (ret < 0)
578 return ret;
579 PDEBUG(D_PROBE, "registered");
580 return 0;
581} 576}
582static void __exit sd_mod_exit(void) 577static void __exit sd_mod_exit(void)
583{ 578{
584 usb_deregister(&sd_driver); 579 usb_deregister(&sd_driver);
585 PDEBUG(D_PROBE, "deregistered");
586} 580}
587 581
588module_init(sd_mod_init); 582module_init(sd_mod_init);
diff --git a/drivers/media/video/gspca/pac7302.c b/drivers/media/video/gspca/pac7302.c
index a66df07d7625..e50c54a3f738 100644
--- a/drivers/media/video/gspca/pac7302.c
+++ b/drivers/media/video/gspca/pac7302.c
@@ -1226,17 +1226,11 @@ static struct usb_driver sd_driver = {
1226/* -- module insert / remove -- */ 1226/* -- module insert / remove -- */
1227static int __init sd_mod_init(void) 1227static int __init sd_mod_init(void)
1228{ 1228{
1229 int ret; 1229 return usb_register(&sd_driver);
1230 ret = usb_register(&sd_driver);
1231 if (ret < 0)
1232 return ret;
1233 PDEBUG(D_PROBE, "registered");
1234 return 0;
1235} 1230}
1236static void __exit sd_mod_exit(void) 1231static void __exit sd_mod_exit(void)
1237{ 1232{
1238 usb_deregister(&sd_driver); 1233 usb_deregister(&sd_driver);
1239 PDEBUG(D_PROBE, "deregistered");
1240} 1234}
1241 1235
1242module_init(sd_mod_init); 1236module_init(sd_mod_init);
diff --git a/drivers/media/video/gspca/pac7311.c b/drivers/media/video/gspca/pac7311.c
index 1cb7e99e92bd..76989d7cab59 100644
--- a/drivers/media/video/gspca/pac7311.c
+++ b/drivers/media/video/gspca/pac7311.c
@@ -874,17 +874,11 @@ static struct usb_driver sd_driver = {
874/* -- module insert / remove -- */ 874/* -- module insert / remove -- */
875static int __init sd_mod_init(void) 875static int __init sd_mod_init(void)
876{ 876{
877 int ret; 877 return usb_register(&sd_driver);
878 ret = usb_register(&sd_driver);
879 if (ret < 0)
880 return ret;
881 PDEBUG(D_PROBE, "registered");
882 return 0;
883} 878}
884static void __exit sd_mod_exit(void) 879static void __exit sd_mod_exit(void)
885{ 880{
886 usb_deregister(&sd_driver); 881 usb_deregister(&sd_driver);
887 PDEBUG(D_PROBE, "deregistered");
888} 882}
889 883
890module_init(sd_mod_init); 884module_init(sd_mod_init);
diff --git a/drivers/media/video/gspca/sn9c2028.c b/drivers/media/video/gspca/sn9c2028.c
index 71d9447a7986..198afc85b4cb 100644
--- a/drivers/media/video/gspca/sn9c2028.c
+++ b/drivers/media/video/gspca/sn9c2028.c
@@ -738,19 +738,12 @@ static struct usb_driver sd_driver = {
738/* -- module insert / remove -- */ 738/* -- module insert / remove -- */
739static int __init sd_mod_init(void) 739static int __init sd_mod_init(void)
740{ 740{
741 int ret; 741 return usb_register(&sd_driver);
742
743 ret = usb_register(&sd_driver);
744 if (ret < 0)
745 return ret;
746 PDEBUG(D_PROBE, "registered");
747 return 0;
748} 742}
749 743
750static void __exit sd_mod_exit(void) 744static void __exit sd_mod_exit(void)
751{ 745{
752 usb_deregister(&sd_driver); 746 usb_deregister(&sd_driver);
753 PDEBUG(D_PROBE, "deregistered");
754} 747}
755 748
756module_init(sd_mod_init); 749module_init(sd_mod_init);
diff --git a/drivers/media/video/gspca/sn9c20x.c b/drivers/media/video/gspca/sn9c20x.c
index 9052d5702556..b1c4d74e1c22 100644
--- a/drivers/media/video/gspca/sn9c20x.c
+++ b/drivers/media/video/gspca/sn9c20x.c
@@ -2467,17 +2467,11 @@ static struct usb_driver sd_driver = {
2467/* -- module insert / remove -- */ 2467/* -- module insert / remove -- */
2468static int __init sd_mod_init(void) 2468static int __init sd_mod_init(void)
2469{ 2469{
2470 int ret; 2470 return usb_register(&sd_driver);
2471 ret = usb_register(&sd_driver);
2472 if (ret < 0)
2473 return ret;
2474 info("registered");
2475 return 0;
2476} 2471}
2477static void __exit sd_mod_exit(void) 2472static void __exit sd_mod_exit(void)
2478{ 2473{
2479 usb_deregister(&sd_driver); 2474 usb_deregister(&sd_driver);
2480 info("deregistered");
2481} 2475}
2482 2476
2483module_init(sd_mod_init); 2477module_init(sd_mod_init);
diff --git a/drivers/media/video/gspca/sonixb.c b/drivers/media/video/gspca/sonixb.c
index 204bb3af4559..906b6b3ecf27 100644
--- a/drivers/media/video/gspca/sonixb.c
+++ b/drivers/media/video/gspca/sonixb.c
@@ -1479,17 +1479,11 @@ static struct usb_driver sd_driver = {
1479/* -- module insert / remove -- */ 1479/* -- module insert / remove -- */
1480static int __init sd_mod_init(void) 1480static int __init sd_mod_init(void)
1481{ 1481{
1482 int ret; 1482 return usb_register(&sd_driver);
1483 ret = usb_register(&sd_driver);
1484 if (ret < 0)
1485 return ret;
1486 PDEBUG(D_PROBE, "registered");
1487 return 0;
1488} 1483}
1489static void __exit sd_mod_exit(void) 1484static void __exit sd_mod_exit(void)
1490{ 1485{
1491 usb_deregister(&sd_driver); 1486 usb_deregister(&sd_driver);
1492 PDEBUG(D_PROBE, "deregistered");
1493} 1487}
1494 1488
1495module_init(sd_mod_init); 1489module_init(sd_mod_init);
diff --git a/drivers/media/video/gspca/sonixj.c b/drivers/media/video/gspca/sonixj.c
index 370544361be2..38b25fbca550 100644
--- a/drivers/media/video/gspca/sonixj.c
+++ b/drivers/media/video/gspca/sonixj.c
@@ -3076,17 +3076,11 @@ static struct usb_driver sd_driver = {
3076/* -- module insert / remove -- */ 3076/* -- module insert / remove -- */
3077static int __init sd_mod_init(void) 3077static int __init sd_mod_init(void)
3078{ 3078{
3079 int ret; 3079 return usb_register(&sd_driver);
3080 ret = usb_register(&sd_driver);
3081 if (ret < 0)
3082 return ret;
3083 info("registered");
3084 return 0;
3085} 3080}
3086static void __exit sd_mod_exit(void) 3081static void __exit sd_mod_exit(void)
3087{ 3082{
3088 usb_deregister(&sd_driver); 3083 usb_deregister(&sd_driver);
3089 info("deregistered");
3090} 3084}
3091 3085
3092module_init(sd_mod_init); 3086module_init(sd_mod_init);
diff --git a/drivers/media/video/gspca/spca1528.c b/drivers/media/video/gspca/spca1528.c
index 3f514eb1d99d..873d63926548 100644
--- a/drivers/media/video/gspca/spca1528.c
+++ b/drivers/media/video/gspca/spca1528.c
@@ -587,18 +587,11 @@ static struct usb_driver sd_driver = {
587/* -- module insert / remove -- */ 587/* -- module insert / remove -- */
588static int __init sd_mod_init(void) 588static int __init sd_mod_init(void)
589{ 589{
590 int ret; 590 return usb_register(&sd_driver);
591
592 ret = usb_register(&sd_driver);
593 if (ret < 0)
594 return ret;
595 info("registered");
596 return 0;
597} 591}
598static void __exit sd_mod_exit(void) 592static void __exit sd_mod_exit(void)
599{ 593{
600 usb_deregister(&sd_driver); 594 usb_deregister(&sd_driver);
601 info("deregistered");
602} 595}
603 596
604module_init(sd_mod_init); 597module_init(sd_mod_init);
diff --git a/drivers/media/video/gspca/spca500.c b/drivers/media/video/gspca/spca500.c
index c02beb6c1e93..669717fffe20 100644
--- a/drivers/media/video/gspca/spca500.c
+++ b/drivers/media/video/gspca/spca500.c
@@ -1093,17 +1093,11 @@ static struct usb_driver sd_driver = {
1093/* -- module insert / remove -- */ 1093/* -- module insert / remove -- */
1094static int __init sd_mod_init(void) 1094static int __init sd_mod_init(void)
1095{ 1095{
1096 int ret; 1096 return usb_register(&sd_driver);
1097 ret = usb_register(&sd_driver);
1098 if (ret < 0)
1099 return ret;
1100 PDEBUG(D_PROBE, "registered");
1101 return 0;
1102} 1097}
1103static void __exit sd_mod_exit(void) 1098static void __exit sd_mod_exit(void)
1104{ 1099{
1105 usb_deregister(&sd_driver); 1100 usb_deregister(&sd_driver);
1106 PDEBUG(D_PROBE, "deregistered");
1107} 1101}
1108 1102
1109module_init(sd_mod_init); 1103module_init(sd_mod_init);
diff --git a/drivers/media/video/gspca/spca501.c b/drivers/media/video/gspca/spca501.c
index c99333933e32..6e2e85c993d4 100644
--- a/drivers/media/video/gspca/spca501.c
+++ b/drivers/media/video/gspca/spca501.c
@@ -2189,17 +2189,11 @@ static struct usb_driver sd_driver = {
2189/* -- module insert / remove -- */ 2189/* -- module insert / remove -- */
2190static int __init sd_mod_init(void) 2190static int __init sd_mod_init(void)
2191{ 2191{
2192 int ret; 2192 return usb_register(&sd_driver);
2193 ret = usb_register(&sd_driver);
2194 if (ret < 0)
2195 return ret;
2196 PDEBUG(D_PROBE, "registered");
2197 return 0;
2198} 2193}
2199static void __exit sd_mod_exit(void) 2194static void __exit sd_mod_exit(void)
2200{ 2195{
2201 usb_deregister(&sd_driver); 2196 usb_deregister(&sd_driver);
2202 PDEBUG(D_PROBE, "deregistered");
2203} 2197}
2204 2198
2205module_init(sd_mod_init); 2199module_init(sd_mod_init);
diff --git a/drivers/media/video/gspca/spca505.c b/drivers/media/video/gspca/spca505.c
index c576eed73abe..148df0032000 100644
--- a/drivers/media/video/gspca/spca505.c
+++ b/drivers/media/video/gspca/spca505.c
@@ -821,18 +821,11 @@ static struct usb_driver sd_driver = {
821/* -- module insert / remove -- */ 821/* -- module insert / remove -- */
822static int __init sd_mod_init(void) 822static int __init sd_mod_init(void)
823{ 823{
824 int ret; 824 return usb_register(&sd_driver);
825
826 ret = usb_register(&sd_driver);
827 if (ret < 0)
828 return ret;
829 PDEBUG(D_PROBE, "registered");
830 return 0;
831} 825}
832static void __exit sd_mod_exit(void) 826static void __exit sd_mod_exit(void)
833{ 827{
834 usb_deregister(&sd_driver); 828 usb_deregister(&sd_driver);
835 PDEBUG(D_PROBE, "deregistered");
836} 829}
837 830
838module_init(sd_mod_init); 831module_init(sd_mod_init);
diff --git a/drivers/media/video/gspca/spca508.c b/drivers/media/video/gspca/spca508.c
index edf0fe157501..2ec7f452a9ea 100644
--- a/drivers/media/video/gspca/spca508.c
+++ b/drivers/media/video/gspca/spca508.c
@@ -1543,18 +1543,11 @@ static struct usb_driver sd_driver = {
1543/* -- module insert / remove -- */ 1543/* -- module insert / remove -- */
1544static int __init sd_mod_init(void) 1544static int __init sd_mod_init(void)
1545{ 1545{
1546 int ret; 1546 return usb_register(&sd_driver);
1547
1548 ret = usb_register(&sd_driver);
1549 if (ret < 0)
1550 return ret;
1551 PDEBUG(D_PROBE, "registered");
1552 return 0;
1553} 1547}
1554static void __exit sd_mod_exit(void) 1548static void __exit sd_mod_exit(void)
1555{ 1549{
1556 usb_deregister(&sd_driver); 1550 usb_deregister(&sd_driver);
1557 PDEBUG(D_PROBE, "deregistered");
1558} 1551}
1559 1552
1560module_init(sd_mod_init); 1553module_init(sd_mod_init);
diff --git a/drivers/media/video/gspca/spca561.c b/drivers/media/video/gspca/spca561.c
index 7bb2355005dc..d561fe9eb553 100644
--- a/drivers/media/video/gspca/spca561.c
+++ b/drivers/media/video/gspca/spca561.c
@@ -1107,17 +1107,11 @@ static struct usb_driver sd_driver = {
1107/* -- module insert / remove -- */ 1107/* -- module insert / remove -- */
1108static int __init sd_mod_init(void) 1108static int __init sd_mod_init(void)
1109{ 1109{
1110 int ret; 1110 return usb_register(&sd_driver);
1111 ret = usb_register(&sd_driver);
1112 if (ret < 0)
1113 return ret;
1114 PDEBUG(D_PROBE, "registered");
1115 return 0;
1116} 1111}
1117static void __exit sd_mod_exit(void) 1112static void __exit sd_mod_exit(void)
1118{ 1113{
1119 usb_deregister(&sd_driver); 1114 usb_deregister(&sd_driver);
1120 PDEBUG(D_PROBE, "deregistered");
1121} 1115}
1122 1116
1123module_init(sd_mod_init); 1117module_init(sd_mod_init);
diff --git a/drivers/media/video/gspca/sq905.c b/drivers/media/video/gspca/sq905.c
index 09b3f93fa4d6..1e39afc5d088 100644
--- a/drivers/media/video/gspca/sq905.c
+++ b/drivers/media/video/gspca/sq905.c
@@ -436,19 +436,12 @@ static struct usb_driver sd_driver = {
436/* -- module insert / remove -- */ 436/* -- module insert / remove -- */
437static int __init sd_mod_init(void) 437static int __init sd_mod_init(void)
438{ 438{
439 int ret; 439 return usb_register(&sd_driver);
440
441 ret = usb_register(&sd_driver);
442 if (ret < 0)
443 return ret;
444 PDEBUG(D_PROBE, "registered");
445 return 0;
446} 440}
447 441
448static void __exit sd_mod_exit(void) 442static void __exit sd_mod_exit(void)
449{ 443{
450 usb_deregister(&sd_driver); 444 usb_deregister(&sd_driver);
451 PDEBUG(D_PROBE, "deregistered");
452} 445}
453 446
454module_init(sd_mod_init); 447module_init(sd_mod_init);
diff --git a/drivers/media/video/gspca/sq905c.c b/drivers/media/video/gspca/sq905c.c
index 4c70628ca615..18c8145bdfb4 100644
--- a/drivers/media/video/gspca/sq905c.c
+++ b/drivers/media/video/gspca/sq905c.c
@@ -341,19 +341,12 @@ static struct usb_driver sd_driver = {
341/* -- module insert / remove -- */ 341/* -- module insert / remove -- */
342static int __init sd_mod_init(void) 342static int __init sd_mod_init(void)
343{ 343{
344 int ret; 344 return usb_register(&sd_driver);
345
346 ret = usb_register(&sd_driver);
347 if (ret < 0)
348 return ret;
349 PDEBUG(D_PROBE, "registered");
350 return 0;
351} 345}
352 346
353static void __exit sd_mod_exit(void) 347static void __exit sd_mod_exit(void)
354{ 348{
355 usb_deregister(&sd_driver); 349 usb_deregister(&sd_driver);
356 PDEBUG(D_PROBE, "deregistered");
357} 350}
358 351
359module_init(sd_mod_init); 352module_init(sd_mod_init);
diff --git a/drivers/media/video/gspca/sq930x.c b/drivers/media/video/gspca/sq930x.c
index 7ae6522d4edf..8edffed24a0d 100644
--- a/drivers/media/video/gspca/sq930x.c
+++ b/drivers/media/video/gspca/sq930x.c
@@ -1185,18 +1185,11 @@ static struct usb_driver sd_driver = {
1185/* -- module insert / remove -- */ 1185/* -- module insert / remove -- */
1186static int __init sd_mod_init(void) 1186static int __init sd_mod_init(void)
1187{ 1187{
1188 int ret; 1188 return usb_register(&sd_driver);
1189
1190 ret = usb_register(&sd_driver);
1191 if (ret < 0)
1192 return ret;
1193 info("registered");
1194 return 0;
1195} 1189}
1196static void __exit sd_mod_exit(void) 1190static void __exit sd_mod_exit(void)
1197{ 1191{
1198 usb_deregister(&sd_driver); 1192 usb_deregister(&sd_driver);
1199 info("deregistered");
1200} 1193}
1201 1194
1202module_init(sd_mod_init); 1195module_init(sd_mod_init);
diff --git a/drivers/media/video/gspca/stk014.c b/drivers/media/video/gspca/stk014.c
index 2aedf4b1bfa3..3266a5397170 100644
--- a/drivers/media/video/gspca/stk014.c
+++ b/drivers/media/video/gspca/stk014.c
@@ -603,17 +603,11 @@ static struct usb_driver sd_driver = {
603/* -- module insert / remove -- */ 603/* -- module insert / remove -- */
604static int __init sd_mod_init(void) 604static int __init sd_mod_init(void)
605{ 605{
606 int ret; 606 return usb_register(&sd_driver);
607 ret = usb_register(&sd_driver);
608 if (ret < 0)
609 return ret;
610 info("registered");
611 return 0;
612} 607}
613static void __exit sd_mod_exit(void) 608static void __exit sd_mod_exit(void)
614{ 609{
615 usb_deregister(&sd_driver); 610 usb_deregister(&sd_driver);
616 info("deregistered");
617} 611}
618 612
619module_init(sd_mod_init); 613module_init(sd_mod_init);
diff --git a/drivers/media/video/gspca/stv0680.c b/drivers/media/video/gspca/stv0680.c
index 8a363d5e1436..4cc1c0ad1b92 100644
--- a/drivers/media/video/gspca/stv0680.c
+++ b/drivers/media/video/gspca/stv0680.c
@@ -357,17 +357,11 @@ static struct usb_driver sd_driver = {
357/* -- module insert / remove -- */ 357/* -- module insert / remove -- */
358static int __init sd_mod_init(void) 358static int __init sd_mod_init(void)
359{ 359{
360 int ret; 360 return usb_register(&sd_driver);
361 ret = usb_register(&sd_driver);
362 if (ret < 0)
363 return ret;
364 PDEBUG(D_PROBE, "registered");
365 return 0;
366} 361}
367static void __exit sd_mod_exit(void) 362static void __exit sd_mod_exit(void)
368{ 363{
369 usb_deregister(&sd_driver); 364 usb_deregister(&sd_driver);
370 PDEBUG(D_PROBE, "deregistered");
371} 365}
372 366
373module_init(sd_mod_init); 367module_init(sd_mod_init);
diff --git a/drivers/media/video/gspca/stv06xx/stv06xx.c b/drivers/media/video/gspca/stv06xx/stv06xx.c
index 14f179a19485..ffb49228c8bd 100644
--- a/drivers/media/video/gspca/stv06xx/stv06xx.c
+++ b/drivers/media/video/gspca/stv06xx/stv06xx.c
@@ -562,17 +562,11 @@ static struct usb_driver sd_driver = {
562/* -- module insert / remove -- */ 562/* -- module insert / remove -- */
563static int __init sd_mod_init(void) 563static int __init sd_mod_init(void)
564{ 564{
565 int ret; 565 return usb_register(&sd_driver);
566 ret = usb_register(&sd_driver);
567 if (ret < 0)
568 return ret;
569 PDEBUG(D_PROBE, "registered");
570 return 0;
571} 566}
572static void __exit sd_mod_exit(void) 567static void __exit sd_mod_exit(void)
573{ 568{
574 usb_deregister(&sd_driver); 569 usb_deregister(&sd_driver);
575 PDEBUG(D_PROBE, "deregistered");
576} 570}
577 571
578module_init(sd_mod_init); 572module_init(sd_mod_init);
diff --git a/drivers/media/video/gspca/sunplus.c b/drivers/media/video/gspca/sunplus.c
index 9494f86b9a85..7cd5582a0bd0 100644
--- a/drivers/media/video/gspca/sunplus.c
+++ b/drivers/media/video/gspca/sunplus.c
@@ -1247,17 +1247,11 @@ static struct usb_driver sd_driver = {
1247/* -- module insert / remove -- */ 1247/* -- module insert / remove -- */
1248static int __init sd_mod_init(void) 1248static int __init sd_mod_init(void)
1249{ 1249{
1250 int ret; 1250 return usb_register(&sd_driver);
1251 ret = usb_register(&sd_driver);
1252 if (ret < 0)
1253 return ret;
1254 PDEBUG(D_PROBE, "registered");
1255 return 0;
1256} 1251}
1257static void __exit sd_mod_exit(void) 1252static void __exit sd_mod_exit(void)
1258{ 1253{
1259 usb_deregister(&sd_driver); 1254 usb_deregister(&sd_driver);
1260 PDEBUG(D_PROBE, "deregistered");
1261} 1255}
1262 1256
1263module_init(sd_mod_init); 1257module_init(sd_mod_init);
diff --git a/drivers/media/video/gspca/t613.c b/drivers/media/video/gspca/t613.c
index 3b3b983f2b9d..3818e87939ef 100644
--- a/drivers/media/video/gspca/t613.c
+++ b/drivers/media/video/gspca/t613.c
@@ -1444,17 +1444,11 @@ static struct usb_driver sd_driver = {
1444/* -- module insert / remove -- */ 1444/* -- module insert / remove -- */
1445static int __init sd_mod_init(void) 1445static int __init sd_mod_init(void)
1446{ 1446{
1447 int ret; 1447 return usb_register(&sd_driver);
1448 ret = usb_register(&sd_driver);
1449 if (ret < 0)
1450 return ret;
1451 PDEBUG(D_PROBE, "registered");
1452 return 0;
1453} 1448}
1454static void __exit sd_mod_exit(void) 1449static void __exit sd_mod_exit(void)
1455{ 1450{
1456 usb_deregister(&sd_driver); 1451 usb_deregister(&sd_driver);
1457 PDEBUG(D_PROBE, "deregistered");
1458} 1452}
1459 1453
1460module_init(sd_mod_init); 1454module_init(sd_mod_init);
diff --git a/drivers/media/video/gspca/tv8532.c b/drivers/media/video/gspca/tv8532.c
index d9c5bf3449d4..d9e3c6050781 100644
--- a/drivers/media/video/gspca/tv8532.c
+++ b/drivers/media/video/gspca/tv8532.c
@@ -421,18 +421,12 @@ static struct usb_driver sd_driver = {
421/* -- module insert / remove -- */ 421/* -- module insert / remove -- */
422static int __init sd_mod_init(void) 422static int __init sd_mod_init(void)
423{ 423{
424 int ret; 424 return usb_register(&sd_driver);
425 ret = usb_register(&sd_driver);
426 if (ret < 0)
427 return ret;
428 PDEBUG(D_PROBE, "registered");
429 return 0;
430} 425}
431 426
432static void __exit sd_mod_exit(void) 427static void __exit sd_mod_exit(void)
433{ 428{
434 usb_deregister(&sd_driver); 429 usb_deregister(&sd_driver);
435 PDEBUG(D_PROBE, "deregistered");
436} 430}
437 431
438module_init(sd_mod_init); 432module_init(sd_mod_init);
diff --git a/drivers/media/video/gspca/vc032x.c b/drivers/media/video/gspca/vc032x.c
index b16fd47e8ced..eb7b1210d757 100644
--- a/drivers/media/video/gspca/vc032x.c
+++ b/drivers/media/video/gspca/vc032x.c
@@ -4226,18 +4226,11 @@ static struct usb_driver sd_driver = {
4226/* -- module insert / remove -- */ 4226/* -- module insert / remove -- */
4227static int __init sd_mod_init(void) 4227static int __init sd_mod_init(void)
4228{ 4228{
4229 int ret; 4229 return usb_register(&sd_driver);
4230
4231 ret = usb_register(&sd_driver);
4232 if (ret < 0)
4233 return ret;
4234 PDEBUG(D_PROBE, "registered");
4235 return 0;
4236} 4230}
4237static void __exit sd_mod_exit(void) 4231static void __exit sd_mod_exit(void)
4238{ 4232{
4239 usb_deregister(&sd_driver); 4233 usb_deregister(&sd_driver);
4240 PDEBUG(D_PROBE, "deregistered");
4241} 4234}
4242 4235
4243module_init(sd_mod_init); 4236module_init(sd_mod_init);
diff --git a/drivers/media/video/gspca/xirlink_cit.c b/drivers/media/video/gspca/xirlink_cit.c
index e4424c6f7a69..36aa44f2464f 100644
--- a/drivers/media/video/gspca/xirlink_cit.c
+++ b/drivers/media/video/gspca/xirlink_cit.c
@@ -3243,17 +3243,11 @@ static struct usb_driver sd_driver = {
3243/* -- module insert / remove -- */ 3243/* -- module insert / remove -- */
3244static int __init sd_mod_init(void) 3244static int __init sd_mod_init(void)
3245{ 3245{
3246 int ret; 3246 return usb_register(&sd_driver);
3247 ret = usb_register(&sd_driver);
3248 if (ret < 0)
3249 return ret;
3250 PDEBUG(D_PROBE, "registered");
3251 return 0;
3252} 3247}
3253static void __exit sd_mod_exit(void) 3248static void __exit sd_mod_exit(void)
3254{ 3249{
3255 usb_deregister(&sd_driver); 3250 usb_deregister(&sd_driver);
3256 PDEBUG(D_PROBE, "deregistered");
3257} 3251}
3258 3252
3259module_init(sd_mod_init); 3253module_init(sd_mod_init);
diff --git a/drivers/media/video/gspca/zc3xx.c b/drivers/media/video/gspca/zc3xx.c
index 0666038a51b0..71d2b1be6f66 100644
--- a/drivers/media/video/gspca/zc3xx.c
+++ b/drivers/media/video/gspca/zc3xx.c
@@ -7120,18 +7120,12 @@ static struct usb_driver sd_driver = {
7120 7120
7121static int __init sd_mod_init(void) 7121static int __init sd_mod_init(void)
7122{ 7122{
7123 int ret; 7123 return usb_register(&sd_driver);
7124 ret = usb_register(&sd_driver);
7125 if (ret < 0)
7126 return ret;
7127 PDEBUG(D_PROBE, "registered");
7128 return 0;
7129} 7124}
7130 7125
7131static void __exit sd_mod_exit(void) 7126static void __exit sd_mod_exit(void)
7132{ 7127{
7133 usb_deregister(&sd_driver); 7128 usb_deregister(&sd_driver);
7134 PDEBUG(D_PROBE, "deregistered");
7135} 7129}
7136 7130
7137module_init(sd_mod_init); 7131module_init(sd_mod_init);