[ALSA] continue on IS_ERR from platform device registration

Continue with the next one on error from device registration.

This would seem the correct thing to do, even if it's not the probe()
error that we're getting.

Signed-off-by: Rene Herman <rene.herman@keyaccess.nl>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/sound/isa/ad1848/ad1848.c b/sound/isa/ad1848/ad1848.c
index 326a057..1f460eb 100644 (file)
--- a/sound/isa/ad1848/ad1848.c
+++ b/sound/isa/ad1848/ad1848.c
@@ -193,10 +193,8 @@ static int __init alsa_card_ad1848_init(void)
                        continue;
                device = platform_device_register_simple(SND_AD1848_DRIVER,
                                                         i, NULL, 0);
-               if (IS_ERR(device)) {
-                       err = PTR_ERR(device);
-                       goto errout;
-               }
+               if (IS_ERR(device))
+                       continue;
                devices[i] = device;
                cards++;
        }
@@ -204,14 +202,10 @@ static int __init alsa_card_ad1848_init(void)
 #ifdef MODULE
                printk(KERN_ERR "AD1848 soundcard not found or device busy\n");
 #endif
-               err = -ENODEV;
-               goto errout;
+               snd_ad1848_unregister_all();
+               return -ENODEV;
        }
        return 0;
-
- errout:
-       snd_ad1848_unregister_all();
-       return err;
 }
 
 static void __exit alsa_card_ad1848_exit(void)

diff --git a/sound/isa/cmi8330.c b/sound/isa/cmi8330.c
index bc0f5eb..35780b8 100644 (file)
--- a/sound/isa/cmi8330.c
+++ b/sound/isa/cmi8330.c
@@ -699,10 +699,8 @@ static int __init alsa_card_cmi8330_init(void)
                        continue;
                device = platform_device_register_simple(CMI8330_DRIVER,
                                                         i, NULL, 0);
-               if (IS_ERR(device)) {
-                       err = PTR_ERR(device);
-                       goto errout;
-               }
+               if (IS_ERR(device))
+                       continue;
                platform_devices[i] = device;
                cards++;
        }
@@ -719,14 +717,10 @@ static int __init alsa_card_cmi8330_init(void)
 #ifdef MODULE
                snd_printk(KERN_ERR "CMI8330 not found or device busy\n");
 #endif
-               err = -ENODEV;
-               goto errout;
+               snd_cmi8330_unregister_all();
+               return -ENODEV;
        }
        return 0;
-
- errout:
-       snd_cmi8330_unregister_all();
-       return err;
 }
 
 static void __exit alsa_card_cmi8330_exit(void)

diff --git a/sound/isa/cs423x/cs4231.c b/sound/isa/cs423x/cs4231.c
index a30dcd9..073dac9 100644 (file)
--- a/sound/isa/cs423x/cs4231.c
+++ b/sound/isa/cs423x/cs4231.c
@@ -209,10 +209,8 @@ static int __init alsa_card_cs4231_init(void)
                        continue;
                device = platform_device_register_simple(SND_CS4231_DRIVER,
                                                         i, NULL, 0);
-               if (IS_ERR(device)) {
-                       err = PTR_ERR(device);
-                       goto errout;
-               }
+               if (IS_ERR(device))
+                       continue;
                devices[i] = device;
                cards++;
        }
@@ -220,14 +218,10 @@ static int __init alsa_card_cs4231_init(void)
 #ifdef MODULE
                printk(KERN_ERR "CS4231 soundcard not found or device busy\n");
 #endif
-               err = -ENODEV;
-               goto errout;
+               snd_cs4231_unregister_all();
+               return -ENODEV;
        }
        return 0;
-
- errout:
-       snd_cs4231_unregister_all();
-       return err;
 }
 
 static void __exit alsa_card_cs4231_exit(void)

diff --git a/sound/isa/cs423x/cs4236.c b/sound/isa/cs423x/cs4236.c
index 382bb17..b07a62b 100644 (file)
--- a/sound/isa/cs423x/cs4236.c
+++ b/sound/isa/cs423x/cs4236.c
@@ -780,10 +780,8 @@ static int __init alsa_card_cs423x_init(void)
                        continue;
                device = platform_device_register_simple(CS423X_DRIVER,
                                                         i, NULL, 0);
-               if (IS_ERR(device)) {
-                       err = PTR_ERR(device);
-                       goto errout;
-               }
+               if (IS_ERR(device))
+                       continue;
                platform_devices[i] = device;
                snd_cs423x_devices++;
        }
@@ -802,14 +800,10 @@ static int __init alsa_card_cs423x_init(void)
 #ifdef MODULE
                printk(KERN_ERR IDENT " soundcard not found or device busy\n");
 #endif
-               err = -ENODEV;
-               goto errout;
+               snd_cs423x_unregister_all();
+               return -ENODEV;
        }
        return 0;
-
- errout:
-       snd_cs423x_unregister_all();
-       return err;
 }
 
 static void __exit alsa_card_cs423x_exit(void)

diff --git a/sound/isa/es1688/es1688.c b/sound/isa/es1688/es1688.c
index 2b69fc8..d83d710 100644 (file)
--- a/sound/isa/es1688/es1688.c
+++ b/sound/isa/es1688/es1688.c
@@ -213,10 +213,8 @@ static int __init alsa_card_es1688_init(void)
                        continue;
                device = platform_device_register_simple(ES1688_DRIVER,
                                                         i, NULL, 0);
-               if (IS_ERR(device)) {
-                       err = PTR_ERR(device);
-                       goto errout;
-               }
+               if (IS_ERR(device))
+                       continue;
                devices[i] = device;
                cards++;
        }
@@ -224,14 +222,10 @@ static int __init alsa_card_es1688_init(void)
 #ifdef MODULE
                printk(KERN_ERR "ESS AudioDrive ES1688 soundcard not found or device busy\n");
 #endif
-               err = -ENODEV;
-               goto errout;
+               snd_es1688_unregister_all();
+               return -ENODEV;
        }
        return 0;
-
- errout:
-       snd_es1688_unregister_all();
-       return err;
 }
 
 static void __exit alsa_card_es1688_exit(void)

diff --git a/sound/isa/es18xx.c b/sound/isa/es18xx.c
index 9fbc185..0da249b 100644 (file)
--- a/sound/isa/es18xx.c
+++ b/sound/isa/es18xx.c
@@ -2391,10 +2391,8 @@ static int __init alsa_card_es18xx_init(void)
                        continue;
                device = platform_device_register_simple(ES18XX_DRIVER,
                                                         i, NULL, 0);
-               if (IS_ERR(device)) {
-                       err = PTR_ERR(device);
-                       goto errout;
-               }
+               if (IS_ERR(device))
+                       continue;
                platform_devices[i] = device;
                cards++;
        }
@@ -2411,14 +2409,10 @@ static int __init alsa_card_es18xx_init(void)
 #ifdef MODULE
                snd_printk(KERN_ERR "ESS AudioDrive ES18xx soundcard not found or device busy\n");
 #endif
-               err = -ENODEV;
-               goto errout;
+               snd_es18xx_unregister_all();
+               return -ENODEV;
        }
        return 0;
-
- errout:
-       snd_es18xx_unregister_all();
-       return err;
 }
 
 static void __exit alsa_card_es18xx_exit(void)

diff --git a/sound/isa/gus/gusclassic.c b/sound/isa/gus/gusclassic.c
index 26dccfe..ed34427 100644 (file)
--- a/sound/isa/gus/gusclassic.c
+++ b/sound/isa/gus/gusclassic.c
@@ -253,10 +253,8 @@ static int __init alsa_card_gusclassic_init(void)
                        continue;
                device = platform_device_register_simple(GUSCLASSIC_DRIVER,
                                                         i, NULL, 0);
-               if (IS_ERR(device)) {
-                       err = PTR_ERR(device);
-                       goto errout;
-               }
+               if (IS_ERR(device))
+                       continue;
                devices[i] = device;
                cards++;
        }
@@ -264,14 +262,10 @@ static int __init alsa_card_gusclassic_init(void)
 #ifdef MODULE
                printk(KERN_ERR "GUS Classic soundcard not found or device busy\n");
 #endif
-               err = -ENODEV;
-               goto errout;
+               snd_gusclassic_unregister_all();
+               return -ENODEV;
        }
        return 0;
-
- errout:
-       snd_gusclassic_unregister_all();
-       return err;
 }
 
 static void __exit alsa_card_gusclassic_exit(void)

diff --git a/sound/isa/gus/gusextreme.c b/sound/isa/gus/gusextreme.c
index 31dc205..aa312de 100644 (file)
--- a/sound/isa/gus/gusextreme.c
+++ b/sound/isa/gus/gusextreme.c
@@ -363,10 +363,8 @@ static int __init alsa_card_gusextreme_init(void)
                        continue;
                device = platform_device_register_simple(GUSEXTREME_DRIVER,
                                                         i, NULL, 0);
-               if (IS_ERR(device)) {
-                       err = PTR_ERR(device);
-                       goto errout;
-               }
+               if (IS_ERR(device))
+                       continue;
                devices[i] = device;
                cards++;
        }
@@ -374,14 +372,10 @@ static int __init alsa_card_gusextreme_init(void)
 #ifdef MODULE
                printk(KERN_ERR "GUS Extreme soundcard not found or device busy\n");
 #endif
-               err = -ENODEV;
-               goto errout;
+               snd_gusextreme_unregister_all();
+               return -ENODEV;
        }
        return 0;
-
- errout:
-       snd_gusextreme_unregister_all();
-       return err;
 }
 
 static void __exit alsa_card_gusextreme_exit(void)

diff --git a/sound/isa/gus/gusmax.c b/sound/isa/gus/gusmax.c
index cafb9b6..a733fab 100644 (file)
--- a/sound/isa/gus/gusmax.c
+++ b/sound/isa/gus/gusmax.c
@@ -390,10 +390,8 @@ static int __init alsa_card_gusmax_init(void)
                        continue;
                device = platform_device_register_simple(GUSMAX_DRIVER,
                                                         i, NULL, 0);
-               if (IS_ERR(device)) {
-                       err = PTR_ERR(device);
-                       goto errout;
-               }
+               if (IS_ERR(device))
+                       continue;
                devices[i] = device;
                cards++;
        }
@@ -401,14 +399,10 @@ static int __init alsa_card_gusmax_init(void)
 #ifdef MODULE
                printk(KERN_ERR "GUS MAX soundcard not found or device busy\n");
 #endif
-               err = -ENODEV;
-               goto errout;
+               snd_gusmax_unregister_all();
+               return -ENODEV;
        }
        return 0;
-
- errout:
-       snd_gusmax_unregister_all();
-       return err;
 }
 
 static void __exit alsa_card_gusmax_exit(void)

diff --git a/sound/isa/gus/interwave.c b/sound/isa/gus/interwave.c
index de71b7a..4be472e 100644 (file)
--- a/sound/isa/gus/interwave.c
+++ b/sound/isa/gus/interwave.c
@@ -947,10 +947,8 @@ static int __init alsa_card_interwave_init(void)
 #endif
                device = platform_device_register_simple(INTERWAVE_DRIVER,
                                                         i, NULL, 0);
-               if (IS_ERR(device)) {
-                       err = PTR_ERR(device);
-                       goto errout;
-               }
+               if (IS_ERR(device))
+                       continue;
                platform_devices[i] = device;
                cards++;
        }
@@ -966,14 +964,10 @@ static int __init alsa_card_interwave_init(void)
 #ifdef MODULE
                printk(KERN_ERR "InterWave soundcard not found or device busy\n");
 #endif
-               err = -ENODEV;
-               goto errout;
+               snd_interwave_unregister_all();
+               return -ENODEV;
        }
        return 0;
-
- errout:
-       snd_interwave_unregister_all();
-       return err;
 }
 
 static void __exit alsa_card_interwave_exit(void)

diff --git a/sound/isa/opl3sa2.c b/sound/isa/opl3sa2.c
index c906e20..02ae73e 100644 (file)
--- a/sound/isa/opl3sa2.c
+++ b/sound/isa/opl3sa2.c
@@ -962,10 +962,8 @@ static int __init alsa_card_opl3sa2_init(void)
 #endif
                device = platform_device_register_simple(OPL3SA2_DRIVER,
                                                         i, NULL, 0);
-               if (IS_ERR(device)) {
-                       err = PTR_ERR(device);
-                       goto errout;
-               }
+               if (IS_ERR(device))
+                       continue;
                platform_devices[i] = device;
                snd_opl3sa2_devices++;
        }
@@ -983,14 +981,10 @@ static int __init alsa_card_opl3sa2_init(void)
 #ifdef MODULE
                snd_printk(KERN_ERR "Yamaha OPL3-SA soundcard not found or device busy\n");
 #endif
-               err = -ENODEV;
-               goto errout;
+               snd_opl3sa2_unregister_all();
+               return -ENODEV;
        }
        return 0;
-
- errout:
-       snd_opl3sa2_unregister_all();
-       return err;
 }
 
 static void __exit alsa_card_opl3sa2_exit(void)

diff --git a/sound/isa/sb/sb16.c b/sound/isa/sb/sb16.c
index 21ea659..24fa190 100644 (file)
--- a/sound/isa/sb/sb16.c
+++ b/sound/isa/sb/sb16.c
@@ -720,10 +720,8 @@ static int __init alsa_card_sb16_init(void)
                        continue;
                device = platform_device_register_simple(SND_SB16_DRIVER,
                                                         i, NULL, 0);
-               if (IS_ERR(device)) {
-                       err = PTR_ERR(device);
-                       goto errout;
-               }
+               if (IS_ERR(device))
+                       continue;
                platform_devices[i] = device;
                cards++;
        }
@@ -745,14 +743,10 @@ static int __init alsa_card_sb16_init(void)
                snd_printk(KERN_ERR "In case, if you have AWE card, try snd-sbawe module\n");
 #endif
 #endif
-               err = -ENODEV;
-               goto errout;
+               snd_sb16_unregister_all();
+               return -ENODEV;
        }
        return 0;
-
- errout:
-       snd_sb16_unregister_all();
-       return err;
 }
 
 static void __exit alsa_card_sb16_exit(void)

diff --git a/sound/isa/sb/sb8.c b/sound/isa/sb/sb8.c
index 3efa23d..f75eeb0 100644 (file)
--- a/sound/isa/sb/sb8.c
+++ b/sound/isa/sb/sb8.c
@@ -264,10 +264,8 @@ static int __init alsa_card_sb8_init(void)
                        continue;
                device = platform_device_register_simple(SND_SB8_DRIVER,
                                                         i, NULL, 0);
-               if (IS_ERR(device)) {
-                       err = PTR_ERR(device);
-                       goto errout;
-               }
+               if (IS_ERR(device))
+                       continue;
                devices[i] = device;
                cards++;
        }
@@ -275,14 +273,10 @@ static int __init alsa_card_sb8_init(void)
 #ifdef MODULE
                snd_printk(KERN_ERR "Sound Blaster soundcard not found or device busy\n");
 #endif
-               err = -ENODEV;
-               goto errout;
+               snd_sb8_unregister_all();
+               return -ENODEV;
        }
        return 0;
-
- errout:
-       snd_sb8_unregister_all();
-       return err;
 }
 
 static void __exit alsa_card_sb8_exit(void)

diff --git a/sound/isa/sgalaxy.c b/sound/isa/sgalaxy.c
index a60e66a..f01a80a 100644 (file)
--- a/sound/isa/sgalaxy.c
+++ b/sound/isa/sgalaxy.c
@@ -366,10 +366,8 @@ static int __init alsa_card_sgalaxy_init(void)
                        continue;
                device = platform_device_register_simple(SND_SGALAXY_DRIVER,
                                                         i, NULL, 0);
-               if (IS_ERR(device)) {
-                       err = PTR_ERR(device);
-                       goto errout;
-               }
+               if (IS_ERR(device))
+                       continue;
                devices[i] = device;
                cards++;
        }
@@ -377,14 +375,10 @@ static int __init alsa_card_sgalaxy_init(void)
 #ifdef MODULE
                snd_printk(KERN_ERR "Sound Galaxy soundcard not found or device busy\n");
 #endif
-               err = -ENODEV;
-               goto errout;
+               snd_sgalaxy_unregister_all();
+               return -ENODEV;
        }
        return 0;
-
- errout:
-       snd_sgalaxy_unregister_all();
-       return err;
 }
 
 static void __exit alsa_card_sgalaxy_exit(void)

diff --git a/sound/isa/sscape.c b/sound/isa/sscape.c
index 48e5552..532f6e0 100644 (file)
--- a/sound/isa/sscape.c
+++ b/sound/isa/sscape.c
@@ -1427,8 +1427,8 @@ static int __init sscape_manual_probe(void)
                    dma[i] == SNDRV_AUTO_DMA) {
                        printk(KERN_INFO
                               "sscape: insufficient parameters, need IO, IRQ, MPU-IRQ and DMA\n");
-                       ret = -ENXIO;
-                       goto errout;
+                       sscape_unregister_all();
+                       return -ENXIO;
                }
 
                /*
@@ -1436,17 +1436,11 @@ static int __init sscape_manual_probe(void)
                 */
                device = platform_device_register_simple(SSCAPE_DRIVER,
                                                         i, NULL, 0);
-               if (IS_ERR(device)) {
-                       ret = PTR_ERR(device);
-                       goto errout;
-               }
+               if (IS_ERR(device))
+                       continue;
                platform_devices[i] = device;
        }
        return 0;
-
- errout:
-       sscape_unregister_all();
-       return ret;
 }
 
 static void sscape_exit(void)

diff --git a/sound/isa/wavefront/wavefront.c b/sound/isa/wavefront/wavefront.c
index 2f13cd5..ed9d017 100644 (file)
--- a/sound/isa/wavefront/wavefront.c
+++ b/sound/isa/wavefront/wavefront.c
@@ -722,10 +722,8 @@ static int __init alsa_card_wavefront_init(void)
 #endif
                device = platform_device_register_simple(WAVEFRONT_DRIVER,
                                                         i, NULL, 0);
-               if (IS_ERR(device)) {
-                       err = PTR_ERR(device);
-                       goto errout;
-               }
+               if (IS_ERR(device))
+                       continue;
                platform_devices[i] = device;
                cards++;
        }
@@ -742,14 +740,10 @@ static int __init alsa_card_wavefront_init(void)
 #ifdef MODULE
                printk (KERN_ERR "No WaveFront cards found or devices busy\n");
 #endif
-               err = -ENODEV;
-               goto errout;
+               snd_wavefront_unregister_all();
+               return -ENODEV;
        }
        return 0;
-
- errout:
-       snd_wavefront_unregister_all();
-       return err;
 }
 
 static void __exit alsa_card_wavefront_exit(void)