a few more -- continue on IS_ERR from platform device registration
PATCH 1/2 a few more -- continue on IS_ERR from platform device registration
Hi Takashi
I previously only concerned myself with sound/isa. When I now checked for more platform_device_register_simple() usages in ALSA I found a couple more drivers that needed the same patches as already submitted for all the ISA drivers.
This first one is the continue-on-iserr patch for sound/drivers. This gets them all.
sound/drivers/dummy.c | 14 ++++---------- sound/drivers/mpu401/mpu401.c | 14 ++++---------- sound/drivers/serial-u16550.c | 14 ++++---------- sound/drivers/virmidi.c | 14 ++++---------- 4 files changed, 16 insertions(+), 40 deletions(-)
Signed-off-by Rene Herman <[email protected]>
sound/drivers/mpu401/mpu401.c +4 -10
@@ -252,10 +252,8 @@ static int __init alsa_card_mpu401_init(#endif device =platform_device_register_simple (SND_MPU401_DRIVER , i,NULL ,0 ); -if (IS_ERR (device)) { - err =PTR_ERR (device); - goto errout; - } +if (IS_ERR (device)) +continue ; platform_devices[i] = device; snd_mpu401_devices++; }
@@ -267,14 +265,10 @@ static int __init alsa_card_mpu401_init(#ifdef MODULE printk (KERN_ERR "MPU-401 device not found or device busy\n" );#endif - err = -ENODEV ; - goto errout; +snd_mpu401_unregister_all (); +return -ENODEV ; }return 0 ; - - errout: -snd_mpu401_unregister_all (); -return err; } static void __exit alsa_card_mpu401_exit(void)
sound/drivers/serial-u16550.c +4 -10
@@ -996,10 +996,8 @@ static int __init alsa_card_serial_init(continue ; device =platform_device_register_simple (SND_SERIAL_DRIVER , i,NULL ,0 ); -if (IS_ERR (device)) { - err =PTR_ERR (device); - goto errout; - } +if (IS_ERR (device)) +continue ; devices[i] = device; cards++; }
@@ -1007,14 +1005,10 @@ static int __init alsa_card_serial_init(#ifdef MODULE printk (KERN_ERR "serial midi soundcard not found or device busy\n" );#endif - err = -ENODEV ; - goto errout; +snd_serial_unregister_all (); +return -ENODEV ; }return 0 ; - - errout: -snd_serial_unregister_all (); -return err; } static void __exit alsa_card_serial_exit(void)
sound/drivers/virmidi.c +4 -10
@@ -169,10 +169,8 @@ static int __init alsa_card_virmidi_initcontinue ; device =platform_device_register_simple (SND_VIRMIDI_DRIVER , i,NULL ,0 ); -if (IS_ERR (device)) { - err =PTR_ERR (device); - goto errout; - } +if (IS_ERR (device)) +continue ; devices[i] = device; cards++; }
@@ -180,14 +178,10 @@ static int __init alsa_card_virmidi_init#ifdef MODULE printk (KERN_ERR "Card-VirMIDI soundcard not found or device busy\n" );#endif - err = -ENODEV ; - goto errout; +snd_virmidi_unregister_all (); +return -ENODEV ; }return 0 ; - - errout: -snd_virmidi_unregister_all (); -return err; } static void __exit alsa_card_virmidi_exit(void)
sound/drivers/dummy.c +4 -10
@@ -675,10 +675,8 @@ static int __init alsa_card_dummy_init(vcontinue ; device =platform_device_register_simple (SND_DUMMY_DRIVER , i,NULL ,0 ); -if (IS_ERR (device)) { - err =PTR_ERR (device); - goto errout; - } +if (IS_ERR (device)) +continue ; devices[i] = device; cards++; }
@@ -686,14 +684,10 @@ static int __init alsa_card_dummy_init(v#ifdef MODULE printk (KERN_ERR "Dummy soundcard not found or device busy\n" );#endif - err = -ENODEV ; - goto errout; +snd_dummy_unregister_all (); +return -ENODEV ; }return 0 ; - - errout: -snd_dummy_unregister_all (); -return err; } static void __exit alsa_card_dummy_exit(void)