diff options
author | Alexey Klimov <klimov.linux@gmail.com> | 2009-01-01 11:02:07 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-03-30 11:42:29 -0400 |
commit | f69e9529ed96ff917096d0b7b3015c8d8ea5750d (patch) | |
tree | 8ae6cf67fa996e3e77b7853e6d7bab4599b019b4 | |
parent | 766231ab859546edd459242c2dbd805bc7fd446e (diff) |
V4L/DVB (10335): gspca - all subdrivers: Fix CodingStyle in sd_mod_init function.
Introduce int ret and check it value after call to usb_register().
Signed-off-by: Alexey Klimov <klimov.linux@gmail.com>
Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
24 files changed, 72 insertions, 24 deletions
diff --git a/drivers/media/video/gspca/conex.c b/drivers/media/video/gspca/conex.c index a7088f60bcd0..825342be41fc 100644 --- a/drivers/media/video/gspca/conex.c +++ b/drivers/media/video/gspca/conex.c | |||
@@ -1028,7 +1028,9 @@ static struct usb_driver sd_driver = { | |||
1028 | /* -- module insert / remove -- */ | 1028 | /* -- module insert / remove -- */ |
1029 | static int __init sd_mod_init(void) | 1029 | static int __init sd_mod_init(void) |
1030 | { | 1030 | { |
1031 | if (usb_register(&sd_driver) < 0) | 1031 | int ret; |
1032 | ret = usb_register(&sd_driver); | ||
1033 | if (ret < 0) | ||
1032 | return -1; | 1034 | return -1; |
1033 | PDEBUG(D_PROBE, "registered"); | 1035 | PDEBUG(D_PROBE, "registered"); |
1034 | return 0; | 1036 | return 0; |
diff --git a/drivers/media/video/gspca/etoms.c b/drivers/media/video/gspca/etoms.c index ca888ac969d0..c5f8dda42435 100644 --- a/drivers/media/video/gspca/etoms.c +++ b/drivers/media/video/gspca/etoms.c | |||
@@ -927,7 +927,9 @@ static struct usb_driver sd_driver = { | |||
927 | /* -- module insert / remove -- */ | 927 | /* -- module insert / remove -- */ |
928 | static int __init sd_mod_init(void) | 928 | static int __init sd_mod_init(void) |
929 | { | 929 | { |
930 | if (usb_register(&sd_driver) < 0) | 930 | int ret; |
931 | ret = usb_register(&sd_driver); | ||
932 | if (ret < 0) | ||
931 | return -1; | 933 | return -1; |
932 | PDEBUG(D_PROBE, "registered"); | 934 | PDEBUG(D_PROBE, "registered"); |
933 | return 0; | 935 | return 0; |
diff --git a/drivers/media/video/gspca/finepix.c b/drivers/media/video/gspca/finepix.c index 76c6e03cb6c9..96a5ca775b55 100644 --- a/drivers/media/video/gspca/finepix.c +++ b/drivers/media/video/gspca/finepix.c | |||
@@ -454,7 +454,9 @@ static struct usb_driver sd_driver = { | |||
454 | /* -- module insert / remove -- */ | 454 | /* -- module insert / remove -- */ |
455 | static int __init sd_mod_init(void) | 455 | static int __init sd_mod_init(void) |
456 | { | 456 | { |
457 | if (usb_register(&sd_driver) < 0) | 457 | int ret; |
458 | ret = usb_register(&sd_driver); | ||
459 | if (ret < 0) | ||
458 | return -1; | 460 | return -1; |
459 | PDEBUG(D_PROBE, "registered"); | 461 | PDEBUG(D_PROBE, "registered"); |
460 | return 0; | 462 | return 0; |
diff --git a/drivers/media/video/gspca/m5602/m5602_core.c b/drivers/media/video/gspca/m5602/m5602_core.c index 37a47db2903d..e78914d7a1a0 100644 --- a/drivers/media/video/gspca/m5602/m5602_core.c +++ b/drivers/media/video/gspca/m5602/m5602_core.c | |||
@@ -373,7 +373,9 @@ static struct usb_driver sd_driver = { | |||
373 | /* -- module insert / remove -- */ | 373 | /* -- module insert / remove -- */ |
374 | static int __init mod_m5602_init(void) | 374 | static int __init mod_m5602_init(void) |
375 | { | 375 | { |
376 | if (usb_register(&sd_driver) < 0) | 376 | int ret; |
377 | ret = usb_register(&sd_driver); | ||
378 | if (ret < 0) | ||
377 | return -1; | 379 | return -1; |
378 | PDEBUG(D_PROBE, "registered"); | 380 | PDEBUG(D_PROBE, "registered"); |
379 | return 0; | 381 | return 0; |
diff --git a/drivers/media/video/gspca/mars.c b/drivers/media/video/gspca/mars.c index ba79afbf8b39..420224afacb1 100644 --- a/drivers/media/video/gspca/mars.c +++ b/drivers/media/video/gspca/mars.c | |||
@@ -420,7 +420,9 @@ static struct usb_driver sd_driver = { | |||
420 | /* -- module insert / remove -- */ | 420 | /* -- module insert / remove -- */ |
421 | static int __init sd_mod_init(void) | 421 | static int __init sd_mod_init(void) |
422 | { | 422 | { |
423 | if (usb_register(&sd_driver) < 0) | 423 | int ret; |
424 | ret = usb_register(&sd_driver); | ||
425 | if (ret < 0) | ||
424 | return -1; | 426 | return -1; |
425 | PDEBUG(D_PROBE, "registered"); | 427 | PDEBUG(D_PROBE, "registered"); |
426 | return 0; | 428 | return 0; |
diff --git a/drivers/media/video/gspca/ov519.c b/drivers/media/video/gspca/ov519.c index ac9b4dc064d6..c78d2d0f43d3 100644 --- a/drivers/media/video/gspca/ov519.c +++ b/drivers/media/video/gspca/ov519.c | |||
@@ -2176,7 +2176,9 @@ static struct usb_driver sd_driver = { | |||
2176 | /* -- module insert / remove -- */ | 2176 | /* -- module insert / remove -- */ |
2177 | static int __init sd_mod_init(void) | 2177 | static int __init sd_mod_init(void) |
2178 | { | 2178 | { |
2179 | if (usb_register(&sd_driver) < 0) | 2179 | int ret; |
2180 | ret = usb_register(&sd_driver); | ||
2181 | if (ret < 0) | ||
2180 | return -1; | 2182 | return -1; |
2181 | PDEBUG(D_PROBE, "registered"); | 2183 | PDEBUG(D_PROBE, "registered"); |
2182 | return 0; | 2184 | return 0; |
diff --git a/drivers/media/video/gspca/ov534.c b/drivers/media/video/gspca/ov534.c index 01314e9995f0..e20ec7df34a7 100644 --- a/drivers/media/video/gspca/ov534.c +++ b/drivers/media/video/gspca/ov534.c | |||
@@ -584,7 +584,9 @@ static struct usb_driver sd_driver = { | |||
584 | /* -- module insert / remove -- */ | 584 | /* -- module insert / remove -- */ |
585 | static int __init sd_mod_init(void) | 585 | static int __init sd_mod_init(void) |
586 | { | 586 | { |
587 | if (usb_register(&sd_driver) < 0) | 587 | int ret; |
588 | ret = usb_register(&sd_driver); | ||
589 | if (ret < 0) | ||
588 | return -1; | 590 | return -1; |
589 | PDEBUG(D_PROBE, "registered"); | 591 | PDEBUG(D_PROBE, "registered"); |
590 | return 0; | 592 | return 0; |
diff --git a/drivers/media/video/gspca/pac207.c b/drivers/media/video/gspca/pac207.c index 546820f52c02..10331728f162 100644 --- a/drivers/media/video/gspca/pac207.c +++ b/drivers/media/video/gspca/pac207.c | |||
@@ -564,7 +564,9 @@ static struct usb_driver sd_driver = { | |||
564 | /* -- module insert / remove -- */ | 564 | /* -- module insert / remove -- */ |
565 | static int __init sd_mod_init(void) | 565 | static int __init sd_mod_init(void) |
566 | { | 566 | { |
567 | if (usb_register(&sd_driver) < 0) | 567 | int ret; |
568 | ret = usb_register(&sd_driver); | ||
569 | if (ret < 0) | ||
568 | return -1; | 570 | return -1; |
569 | PDEBUG(D_PROBE, "registered"); | 571 | PDEBUG(D_PROBE, "registered"); |
570 | return 0; | 572 | return 0; |
diff --git a/drivers/media/video/gspca/pac7311.c b/drivers/media/video/gspca/pac7311.c index f34bbc5db501..8a4551ecd0a6 100644 --- a/drivers/media/video/gspca/pac7311.c +++ b/drivers/media/video/gspca/pac7311.c | |||
@@ -1096,7 +1096,9 @@ static struct usb_driver sd_driver = { | |||
1096 | /* -- module insert / remove -- */ | 1096 | /* -- module insert / remove -- */ |
1097 | static int __init sd_mod_init(void) | 1097 | static int __init sd_mod_init(void) |
1098 | { | 1098 | { |
1099 | if (usb_register(&sd_driver) < 0) | 1099 | int ret; |
1100 | ret = usb_register(&sd_driver); | ||
1101 | if (ret < 0) | ||
1100 | return -1; | 1102 | return -1; |
1101 | PDEBUG(D_PROBE, "registered"); | 1103 | PDEBUG(D_PROBE, "registered"); |
1102 | return 0; | 1104 | return 0; |
diff --git a/drivers/media/video/gspca/sonixb.c b/drivers/media/video/gspca/sonixb.c index 5ec361c779be..dd9417eea16a 100644 --- a/drivers/media/video/gspca/sonixb.c +++ b/drivers/media/video/gspca/sonixb.c | |||
@@ -1271,7 +1271,9 @@ static struct usb_driver sd_driver = { | |||
1271 | /* -- module insert / remove -- */ | 1271 | /* -- module insert / remove -- */ |
1272 | static int __init sd_mod_init(void) | 1272 | static int __init sd_mod_init(void) |
1273 | { | 1273 | { |
1274 | if (usb_register(&sd_driver) < 0) | 1274 | int ret; |
1275 | ret = usb_register(&sd_driver); | ||
1276 | if (ret < 0) | ||
1275 | return -1; | 1277 | return -1; |
1276 | PDEBUG(D_PROBE, "registered"); | 1278 | PDEBUG(D_PROBE, "registered"); |
1277 | return 0; | 1279 | return 0; |
diff --git a/drivers/media/video/gspca/sonixj.c b/drivers/media/video/gspca/sonixj.c index 5c159d89bd82..d1b604c07afd 100644 --- a/drivers/media/video/gspca/sonixj.c +++ b/drivers/media/video/gspca/sonixj.c | |||
@@ -1793,7 +1793,9 @@ static struct usb_driver sd_driver = { | |||
1793 | /* -- module insert / remove -- */ | 1793 | /* -- module insert / remove -- */ |
1794 | static int __init sd_mod_init(void) | 1794 | static int __init sd_mod_init(void) |
1795 | { | 1795 | { |
1796 | if (usb_register(&sd_driver) < 0) | 1796 | int ret; |
1797 | ret = usb_register(&sd_driver); | ||
1798 | if (ret < 0) | ||
1797 | return -1; | 1799 | return -1; |
1798 | info("registered"); | 1800 | info("registered"); |
1799 | return 0; | 1801 | return 0; |
diff --git a/drivers/media/video/gspca/spca500.c b/drivers/media/video/gspca/spca500.c index 94ed469a3ada..75494016515d 100644 --- a/drivers/media/video/gspca/spca500.c +++ b/drivers/media/video/gspca/spca500.c | |||
@@ -1092,7 +1092,9 @@ static struct usb_driver sd_driver = { | |||
1092 | /* -- module insert / remove -- */ | 1092 | /* -- module insert / remove -- */ |
1093 | static int __init sd_mod_init(void) | 1093 | static int __init sd_mod_init(void) |
1094 | { | 1094 | { |
1095 | if (usb_register(&sd_driver) < 0) | 1095 | int ret; |
1096 | ret = usb_register(&sd_driver); | ||
1097 | if (ret < 0) | ||
1096 | return -1; | 1098 | return -1; |
1097 | PDEBUG(D_PROBE, "registered"); | 1099 | PDEBUG(D_PROBE, "registered"); |
1098 | return 0; | 1100 | return 0; |
diff --git a/drivers/media/video/gspca/spca501.c b/drivers/media/video/gspca/spca501.c index 766da90e6eb7..9ae62f18f725 100644 --- a/drivers/media/video/gspca/spca501.c +++ b/drivers/media/video/gspca/spca501.c | |||
@@ -2210,7 +2210,9 @@ static struct usb_driver sd_driver = { | |||
2210 | /* -- module insert / remove -- */ | 2210 | /* -- module insert / remove -- */ |
2211 | static int __init sd_mod_init(void) | 2211 | static int __init sd_mod_init(void) |
2212 | { | 2212 | { |
2213 | if (usb_register(&sd_driver) < 0) | 2213 | int ret; |
2214 | ret = usb_register(&sd_driver); | ||
2215 | if (ret < 0) | ||
2214 | return -1; | 2216 | return -1; |
2215 | PDEBUG(D_PROBE, "registered"); | 2217 | PDEBUG(D_PROBE, "registered"); |
2216 | return 0; | 2218 | return 0; |
diff --git a/drivers/media/video/gspca/spca505.c b/drivers/media/video/gspca/spca505.c index 90d555361ae7..32ae57e5f7be 100644 --- a/drivers/media/video/gspca/spca505.c +++ b/drivers/media/video/gspca/spca505.c | |||
@@ -862,7 +862,9 @@ static struct usb_driver sd_driver = { | |||
862 | /* -- module insert / remove -- */ | 862 | /* -- module insert / remove -- */ |
863 | static int __init sd_mod_init(void) | 863 | static int __init sd_mod_init(void) |
864 | { | 864 | { |
865 | if (usb_register(&sd_driver) < 0) | 865 | int ret; |
866 | ret = usb_register(&sd_driver); | ||
867 | if (ret < 0) | ||
866 | return -1; | 868 | return -1; |
867 | PDEBUG(D_PROBE, "registered"); | 869 | PDEBUG(D_PROBE, "registered"); |
868 | return 0; | 870 | return 0; |
diff --git a/drivers/media/video/gspca/spca506.c b/drivers/media/video/gspca/spca506.c index 99fa3fc1cb62..aa3ecc8acfa6 100644 --- a/drivers/media/video/gspca/spca506.c +++ b/drivers/media/video/gspca/spca506.c | |||
@@ -771,7 +771,9 @@ static struct usb_driver sd_driver = { | |||
771 | /* -- module insert / remove -- */ | 771 | /* -- module insert / remove -- */ |
772 | static int __init sd_mod_init(void) | 772 | static int __init sd_mod_init(void) |
773 | { | 773 | { |
774 | if (usb_register(&sd_driver) < 0) | 774 | int ret; |
775 | ret = usb_register(&sd_driver); | ||
776 | if (ret < 0) | ||
775 | return -1; | 777 | return -1; |
776 | PDEBUG(D_PROBE, "registered"); | 778 | PDEBUG(D_PROBE, "registered"); |
777 | return 0; | 779 | return 0; |
diff --git a/drivers/media/video/gspca/spca508.c b/drivers/media/video/gspca/spca508.c index f5c045967379..c9d5e6c80912 100644 --- a/drivers/media/video/gspca/spca508.c +++ b/drivers/media/video/gspca/spca508.c | |||
@@ -1665,7 +1665,9 @@ static struct usb_driver sd_driver = { | |||
1665 | /* -- module insert / remove -- */ | 1665 | /* -- module insert / remove -- */ |
1666 | static int __init sd_mod_init(void) | 1666 | static int __init sd_mod_init(void) |
1667 | { | 1667 | { |
1668 | if (usb_register(&sd_driver) < 0) | 1668 | int ret; |
1669 | ret = usb_register(&sd_driver); | ||
1670 | if (ret < 0) | ||
1669 | return -1; | 1671 | return -1; |
1670 | PDEBUG(D_PROBE, "registered"); | 1672 | PDEBUG(D_PROBE, "registered"); |
1671 | return 0; | 1673 | return 0; |
diff --git a/drivers/media/video/gspca/spca561.c b/drivers/media/video/gspca/spca561.c index d64e7d64d053..1538350849f9 100644 --- a/drivers/media/video/gspca/spca561.c +++ b/drivers/media/video/gspca/spca561.c | |||
@@ -1196,7 +1196,9 @@ static struct usb_driver sd_driver = { | |||
1196 | /* -- module insert / remove -- */ | 1196 | /* -- module insert / remove -- */ |
1197 | static int __init sd_mod_init(void) | 1197 | static int __init sd_mod_init(void) |
1198 | { | 1198 | { |
1199 | if (usb_register(&sd_driver) < 0) | 1199 | int ret; |
1200 | ret = usb_register(&sd_driver); | ||
1201 | if (ret < 0) | ||
1200 | return -1; | 1202 | return -1; |
1201 | PDEBUG(D_PROBE, "registered"); | 1203 | PDEBUG(D_PROBE, "registered"); |
1202 | return 0; | 1204 | return 0; |
diff --git a/drivers/media/video/gspca/stk014.c b/drivers/media/video/gspca/stk014.c index cd1fbff0c94c..8743c03ed4aa 100644 --- a/drivers/media/video/gspca/stk014.c +++ b/drivers/media/video/gspca/stk014.c | |||
@@ -560,7 +560,9 @@ static struct usb_driver sd_driver = { | |||
560 | /* -- module insert / remove -- */ | 560 | /* -- module insert / remove -- */ |
561 | static int __init sd_mod_init(void) | 561 | static int __init sd_mod_init(void) |
562 | { | 562 | { |
563 | if (usb_register(&sd_driver) < 0) | 563 | int ret; |
564 | ret = usb_register(&sd_driver); | ||
565 | if (ret < 0) | ||
564 | return -1; | 566 | return -1; |
565 | info("registered"); | 567 | info("registered"); |
566 | return 0; | 568 | return 0; |
diff --git a/drivers/media/video/gspca/stv06xx/stv06xx.c b/drivers/media/video/gspca/stv06xx/stv06xx.c index c60b163335c5..c43534db74bb 100644 --- a/drivers/media/video/gspca/stv06xx/stv06xx.c +++ b/drivers/media/video/gspca/stv06xx/stv06xx.c | |||
@@ -500,7 +500,9 @@ static struct usb_driver sd_driver = { | |||
500 | /* -- module insert / remove -- */ | 500 | /* -- module insert / remove -- */ |
501 | static int __init sd_mod_init(void) | 501 | static int __init sd_mod_init(void) |
502 | { | 502 | { |
503 | if (usb_register(&sd_driver) < 0) | 503 | int ret; |
504 | ret = usb_register(&sd_driver); | ||
505 | if (ret < 0) | ||
504 | return -1; | 506 | return -1; |
505 | PDEBUG(D_PROBE, "registered"); | 507 | PDEBUG(D_PROBE, "registered"); |
506 | return 0; | 508 | return 0; |
diff --git a/drivers/media/video/gspca/sunplus.c b/drivers/media/video/gspca/sunplus.c index 1f07476a9905..a7d324cf1a5c 100644 --- a/drivers/media/video/gspca/sunplus.c +++ b/drivers/media/video/gspca/sunplus.c | |||
@@ -1464,7 +1464,9 @@ static struct usb_driver sd_driver = { | |||
1464 | /* -- module insert / remove -- */ | 1464 | /* -- module insert / remove -- */ |
1465 | static int __init sd_mod_init(void) | 1465 | static int __init sd_mod_init(void) |
1466 | { | 1466 | { |
1467 | if (usb_register(&sd_driver) < 0) | 1467 | int ret; |
1468 | ret = usb_register(&sd_driver); | ||
1469 | if (ret < 0) | ||
1468 | return -1; | 1470 | return -1; |
1469 | PDEBUG(D_PROBE, "registered"); | 1471 | PDEBUG(D_PROBE, "registered"); |
1470 | return 0; | 1472 | return 0; |
diff --git a/drivers/media/video/gspca/t613.c b/drivers/media/video/gspca/t613.c index 74ca17845223..1dfdbf58526f 100644 --- a/drivers/media/video/gspca/t613.c +++ b/drivers/media/video/gspca/t613.c | |||
@@ -1171,7 +1171,9 @@ static struct usb_driver sd_driver = { | |||
1171 | /* -- module insert / remove -- */ | 1171 | /* -- module insert / remove -- */ |
1172 | static int __init sd_mod_init(void) | 1172 | static int __init sd_mod_init(void) |
1173 | { | 1173 | { |
1174 | if (usb_register(&sd_driver) < 0) | 1174 | int ret; |
1175 | ret = usb_register(&sd_driver); | ||
1176 | if (ret < 0) | ||
1175 | return -1; | 1177 | return -1; |
1176 | PDEBUG(D_PROBE, "registered"); | 1178 | PDEBUG(D_PROBE, "registered"); |
1177 | return 0; | 1179 | return 0; |
diff --git a/drivers/media/video/gspca/tv8532.c b/drivers/media/video/gspca/tv8532.c index 1da292ea1c77..0bcbdb22e018 100644 --- a/drivers/media/video/gspca/tv8532.c +++ b/drivers/media/video/gspca/tv8532.c | |||
@@ -569,7 +569,9 @@ static struct usb_driver sd_driver = { | |||
569 | /* -- module insert / remove -- */ | 569 | /* -- module insert / remove -- */ |
570 | static int __init sd_mod_init(void) | 570 | static int __init sd_mod_init(void) |
571 | { | 571 | { |
572 | if (usb_register(&sd_driver) < 0) | 572 | int ret; |
573 | ret = usb_register(&sd_driver); | ||
574 | if (ret < 0) | ||
573 | return -1; | 575 | return -1; |
574 | PDEBUG(D_PROBE, "registered"); | 576 | PDEBUG(D_PROBE, "registered"); |
575 | return 0; | 577 | return 0; |
diff --git a/drivers/media/video/gspca/vc032x.c b/drivers/media/video/gspca/vc032x.c index ab5a25cfc69e..0f475ec2ab93 100644 --- a/drivers/media/video/gspca/vc032x.c +++ b/drivers/media/video/gspca/vc032x.c | |||
@@ -2459,7 +2459,9 @@ static struct usb_driver sd_driver = { | |||
2459 | /* -- module insert / remove -- */ | 2459 | /* -- module insert / remove -- */ |
2460 | static int __init sd_mod_init(void) | 2460 | static int __init sd_mod_init(void) |
2461 | { | 2461 | { |
2462 | if (usb_register(&sd_driver) < 0) | 2462 | int ret; |
2463 | ret = usb_register(&sd_driver); | ||
2464 | if (ret < 0) | ||
2463 | return -1; | 2465 | return -1; |
2464 | PDEBUG(D_PROBE, "registered"); | 2466 | PDEBUG(D_PROBE, "registered"); |
2465 | return 0; | 2467 | return 0; |
diff --git a/drivers/media/video/gspca/zc3xx.c b/drivers/media/video/gspca/zc3xx.c index c32477db3bab..afc10a9ac539 100644 --- a/drivers/media/video/gspca/zc3xx.c +++ b/drivers/media/video/gspca/zc3xx.c | |||
@@ -7599,7 +7599,9 @@ static struct usb_driver sd_driver = { | |||
7599 | 7599 | ||
7600 | static int __init sd_mod_init(void) | 7600 | static int __init sd_mod_init(void) |
7601 | { | 7601 | { |
7602 | if (usb_register(&sd_driver) < 0) | 7602 | int ret; |
7603 | ret = usb_register(&sd_driver); | ||
7604 | if (ret < 0) | ||
7603 | return -1; | 7605 | return -1; |
7604 | PDEBUG(D_PROBE, "registered"); | 7606 | PDEBUG(D_PROBE, "registered"); |
7605 | return 0; | 7607 | return 0; |