[ALSA] Fix __devinit and __devexit issues with sound drivers

[powerpc.git] / sound / isa / es1688 / es1688.c

diff --git a/sound/isa/es1688/es1688.c b/sound/isa/es1688/es1688.c
index 2b69fc8..65f97ff 100644 (file)
--- a/sound/isa/es1688/es1688.c
+++ b/sound/isa/es1688/es1688.c
@@ -73,7 +73,7 @@ static struct platform_device *devices[SNDRV_CARDS];
 
 #define PFX    "es1688: "
 
-static int __init snd_es1688_probe(struct platform_device *pdev)
+static int __devinit snd_es1688_probe(struct platform_device *pdev)
 {
        int dev = pdev->id;
        static int possible_irqs[] = {5, 9, 10, 7, -1};
@@ -153,7 +153,7 @@ static int __init snd_es1688_probe(struct platform_device *pdev)
                if ((err = snd_mpu401_uart_new(card, 0, MPU401_HW_ES1688,
                                               chip->mpu_port, 0,
                                               xmpu_irq,
-                                              SA_INTERRUPT,
+                                              IRQF_DISABLED,
                                               NULL)) < 0)
                        goto _err;
        }
@@ -171,7 +171,7 @@ static int __init snd_es1688_probe(struct platform_device *pdev)
        return err;
 }
 
-static int snd_es1688_remove(struct platform_device *devptr)
+static int __devexit snd_es1688_remove(struct platform_device *devptr)
 {
        snd_card_free(platform_get_drvdata(devptr));
        platform_set_drvdata(devptr, NULL);
@@ -182,7 +182,7 @@ static int snd_es1688_remove(struct platform_device *devptr)
 
 static struct platform_driver snd_es1688_driver = {
        .probe          = snd_es1688_probe,
-       .remove         = snd_es1688_remove,
+       .remove         = __devexit_p(snd_es1688_remove),
        /* FIXME: suspend/resume */
        .driver         = {
                .name   = ES1688_DRIVER
@@ -213,9 +213,11 @@ 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;
+               if (!platform_get_drvdata(device)) {
+                       platform_device_unregister(device);
+                       continue;
                }
                devices[i] = device;
                cards++;
@@ -224,14 +226,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)