ALSA: convert PM ops of platform_driver to new pm ops
[linux-3.10.git] / sound / ppc / powermac.c
index e9b02d9..f5ceb6f 100644 (file)
@@ -21,7 +21,7 @@
 #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"
@@ -36,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.");
@@ -51,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;
@@ -144,19 +144,24 @@ static int __devexit snd_pmac_remove(struct platform_device *devptr)
 }
 
 #ifdef CONFIG_PM
-static int snd_pmac_driver_suspend(struct platform_device *devptr, pm_message_t state)
+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"
@@ -164,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,
        },
 };