ALSA: platform: Check CONFIG_PM_SLEEP instead of CONFIG_PM
[linux-3.10.git] / sound / ppc / powermac.c
index 875f1f7..210cafe 100644 (file)
  *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  */
 
-#include <sound/driver.h>
 #include <linux/init.h>
 #include <linux/err.h>
 #include <linux/platform_device.h>
-#include <linux/moduleparam.h>
+#include <linux/module.h>
 #include <sound/core.h>
 #include <sound/initval.h>
 #include "pmac.h"
@@ -37,7 +36,7 @@ MODULE_LICENSE("GPL");
 
 static int index = SNDRV_DEFAULT_IDX1;         /* Index 0-MAX */
 static char *id = SNDRV_DEFAULT_STR1;          /* ID for this card */
-static int enable_beep = 1;
+static bool enable_beep = 1;
 
 module_param(index, int, 0444);
 MODULE_PARM_DESC(index, "Index value for " CHIP_NAME " soundchip.");
@@ -52,16 +51,16 @@ static struct platform_device *device;
 /*
  */
 
-static int __init snd_pmac_probe(struct platform_device *devptr)
+static int __devinit snd_pmac_probe(struct platform_device *devptr)
 {
        struct snd_card *card;
        struct snd_pmac *chip;
        char *name_ext;
        int err;
 
-       card = snd_card_new(index, id, THIS_MODULE, 0);
-       if (card == NULL)
-               return -ENOMEM;
+       err = snd_card_create(index, id, THIS_MODULE, 0, &card);
+       if (err < 0)
+               return err;
 
        if ((err = snd_pmac_new(card, &chip)) < 0)
                goto __error;
@@ -94,13 +93,6 @@ static int __init snd_pmac_probe(struct platform_device *devptr)
                if ( snd_pmac_tumbler_init(chip) < 0 || snd_pmac_tumbler_post_init() < 0)
                        goto __error;
                break;
-       case PMAC_TOONIE:
-               strcpy(card->driver, "PMac Toonie");
-               strcpy(card->shortname, "PowerMac Toonie");
-               strcpy(card->longname, card->shortname);
-               if ((err = snd_pmac_toonie_init(chip)) < 0)
-                       goto __error;
-               break;
        case PMAC_AWACS:
        case PMAC_SCREAMER:
                name_ext = chip->model == PMAC_SCREAMER ? "Screamer" : "AWACS";
@@ -118,7 +110,7 @@ static int __init snd_pmac_probe(struct platform_device *devptr)
                        goto __error;
                break;
        default:
-               snd_printk("unsupported hardware %d\n", chip->model);
+               snd_printk(KERN_ERR "unsupported hardware %d\n", chip->model);
                err = -EINVAL;
                goto __error;
        }
@@ -151,20 +143,25 @@ static int __devexit snd_pmac_remove(struct platform_device *devptr)
        return 0;
 }
 
-#ifdef CONFIG_PM
-static int snd_pmac_driver_suspend(struct platform_device *devptr, pm_message_t state)
+#ifdef CONFIG_PM_SLEEP
+static int snd_pmac_driver_suspend(struct device *dev)
 {
-       struct snd_card *card = platform_get_drvdata(devptr);
+       struct snd_card *card = dev_get_drvdata(dev);
        snd_pmac_suspend(card->private_data);
        return 0;
 }
 
-static int snd_pmac_driver_resume(struct platform_device *devptr)
+static int snd_pmac_driver_resume(struct device *dev)
 {
-       struct snd_card *card = platform_get_drvdata(devptr);
+       struct snd_card *card = dev_get_drvdata(dev);
        snd_pmac_resume(card->private_data);
        return 0;
 }
+
+static SIMPLE_DEV_PM_OPS(snd_pmac_pm, snd_pmac_driver_suspend, snd_pmac_driver_resume);
+#define SND_PMAC_PM_OPS        &snd_pmac_pm
+#else
+#define SND_PMAC_PM_OPS        NULL
 #endif
 
 #define SND_PMAC_DRIVER                "snd_powermac"
@@ -172,12 +169,10 @@ static int snd_pmac_driver_resume(struct platform_device *devptr)
 static struct platform_driver snd_pmac_driver = {
        .probe          = snd_pmac_probe,
        .remove         = __devexit_p(snd_pmac_remove),
-#ifdef CONFIG_PM
-       .suspend        = snd_pmac_driver_suspend,
-       .resume         = snd_pmac_driver_resume,
-#endif
        .driver         = {
-               .name   = SND_PMAC_DRIVER
+               .name   = SND_PMAC_DRIVER,
+               .owner  = THIS_MODULE,
+               .pm     = SND_PMAC_PM_OPS,
        },
 };
 
@@ -188,21 +183,14 @@ static int __init alsa_card_pmac_init(void)
        if ((err = platform_driver_register(&snd_pmac_driver)) < 0)
                return err;
        device = platform_device_register_simple(SND_PMAC_DRIVER, -1, NULL, 0);
-       if (!IS_ERR(device)) {
-               if (platform_get_drvdata(device))
-                       return 0;
-               platform_device_unregister(device);
-               err = -ENODEV;
-       } else
-               err = PTR_ERR(device);
-       platform_driver_unregister(&snd_pmac_driver);
-       return err;
+       return 0;
 
 }
 
 static void __exit alsa_card_pmac_exit(void)
 {
-       platform_device_unregister(device);
+       if (!IS_ERR(device))
+               platform_device_unregister(device);
        platform_driver_unregister(&snd_pmac_driver);
 }