Skip to content

Commit

Permalink
ALSA: convert PM ops of platform_driver to new pm ops
Browse files Browse the repository at this point in the history 
Signed-off-by: Takashi Iwai <[email protected]>
  • Loading branch information
@tiwai
tiwai committed Jul 3, 2012
1 parent 8bf01d8 commit 284e7ca
Show file tree
Hide file tree
Showing 7 changed files with 58 additions and 51 deletions.
9 changes: 3 additions & 6 deletions sound/arm/pxa2xx-ac97.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ static struct pxa2xx_pcm_client pxa2xx_ac97_pcm_client = {

#ifdef CONFIG_PM

static int pxa2xx_ac97_do_suspend(struct snd_card *card, pm_message_t state)
static int pxa2xx_ac97_do_suspend(struct snd_card *card)
{
pxa2xx_audio_ops_t *platform_ops = card->dev->platform_data;

Expand Down Expand Up @@ -144,7 +144,7 @@ static int pxa2xx_ac97_suspend(struct device *dev)
int ret = 0;

if (card)
ret = pxa2xx_ac97_do_suspend(card, PMSG_SUSPEND);
ret = pxa2xx_ac97_do_suspend(card);

return ret;
}
Expand All @@ -160,10 +160,7 @@ static int pxa2xx_ac97_resume(struct device *dev)
return ret;
}

static const struct dev_pm_ops pxa2xx_ac97_pm_ops = {
.suspend = pxa2xx_ac97_suspend,
.resume = pxa2xx_ac97_resume,
};
static SIMPLE_DEV_PM_OPS(pxa2xx_ac97_pm_ops, pxa2xx_ac97_suspend, pxa2xx_ac97_resume);
#endif

static int __devinit pxa2xx_ac97_probe(struct platform_device *dev)
Expand Down
17 changes: 9 additions & 8 deletions sound/atmel/abdac.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -535,9 +535,9 @@ static int __devinit atmel_abdac_probe(struct platform_device *pdev)
}

#ifdef CONFIG_PM
static int atmel_abdac_suspend(struct platform_device *pdev, pm_message_t msg)
static int atmel_abdac_suspend(struct device *pdev)
{
struct snd_card *card = platform_get_drvdata(pdev);
struct snd_card *card = dev_get_drvdata(pdev);
struct atmel_abdac *dac = card->private_data;

dw_dma_cyclic_stop(dac->dma.chan);
Expand All @@ -547,9 +547,9 @@ static int atmel_abdac_suspend(struct platform_device *pdev, pm_message_t msg)
return 0;
}

static int atmel_abdac_resume(struct platform_device *pdev)
static int atmel_abdac_resume(struct device *pdev)
{
struct snd_card *card = platform_get_drvdata(pdev);
struct snd_card *card = dev_get_drvdata(pdev);
struct atmel_abdac *dac = card->private_data;

clk_enable(dac->pclk);
Expand All @@ -559,9 +559,11 @@ static int atmel_abdac_resume(struct platform_device *pdev)

return 0;
}

static SIMPLE_DEV_PM_OPS(atmel_abdac_pm, atmel_abdac_suspend, atmel_abdac_resume);
#define ATMEL_ABDAC_PM_OPS &atmel_abdac_pm
#else
#define atmel_abdac_suspend NULL
#define atmel_abdac_resume NULL
#define ATMEL_ABDAC_PM_OPS NULL
#endif

static int __devexit atmel_abdac_remove(struct platform_device *pdev)
Expand Down Expand Up @@ -590,9 +592,8 @@ static struct platform_driver atmel_abdac_driver = {
.driver = {
.name = "atmel_abdac",
.owner = THIS_MODULE,
.pm = ATMEL_ABDAC_PM_OPS,
},
.suspend = atmel_abdac_suspend,
.resume = atmel_abdac_resume,
};

static int __init atmel_abdac_init(void)
Expand Down
17 changes: 9 additions & 8 deletions sound/atmel/ac97c.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1135,9 +1135,9 @@ static int __devinit atmel_ac97c_probe(struct platform_device *pdev)
}

#ifdef CONFIG_PM
static int atmel_ac97c_suspend(struct platform_device *pdev, pm_message_t msg)
static int atmel_ac97c_suspend(struct device *pdev)
{
struct snd_card *card = platform_get_drvdata(pdev);
struct snd_card *card = dev_get_drvdata(pdev);
struct atmel_ac97c *chip = card->private_data;

if (cpu_is_at32ap7000()) {
Expand All @@ -1151,9 +1151,9 @@ static int atmel_ac97c_suspend(struct platform_device *pdev, pm_message_t msg)
return 0;
}

static int atmel_ac97c_resume(struct platform_device *pdev)
static int atmel_ac97c_resume(struct device *pdev)
{
struct snd_card *card = platform_get_drvdata(pdev);
struct snd_card *card = dev_get_drvdata(pdev);
struct atmel_ac97c *chip = card->private_data;

clk_enable(chip->pclk);
Expand All @@ -1165,9 +1165,11 @@ static int atmel_ac97c_resume(struct platform_device *pdev)
}
return 0;
}

static SIMPLE_DEV_PM_OPS(atmel_ac97c_pm, atmel_ac97c_suspend, atmel_ac97c_resume);
#define ATMEL_AC97C_PM_OPS &atmel_ac97c_pm
#else
#define atmel_ac97c_suspend NULL
#define atmel_ac97c_resume NULL
#define ATMEL_AC97C_PM_OPS NULL
#endif

static int __devexit atmel_ac97c_remove(struct platform_device *pdev)
Expand Down Expand Up @@ -1211,9 +1213,8 @@ static struct platform_driver atmel_ac97c_driver = {
.driver = {
.name = "atmel_ac97c",
.owner = THIS_MODULE,
.pm = ATMEL_AC97C_PM_OPS,
},
.suspend = atmel_ac97c_suspend,
.resume = atmel_ac97c_resume,
};

static int __init atmel_ac97c_init(void)
Expand Down
19 changes: 10 additions & 9 deletions sound/drivers/aloop.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1177,10 +1177,9 @@ static int __devexit loopback_remove(struct platform_device *devptr)
}

#ifdef CONFIG_PM
static int loopback_suspend(struct platform_device *pdev,
pm_message_t state)
static int loopback_suspend(struct device *pdev)
{
struct snd_card *card = platform_get_drvdata(pdev);
struct snd_card *card = dev_get_drvdata(pdev);
struct loopback *loopback = card->private_data;

snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);
Expand All @@ -1190,27 +1189,29 @@ static int loopback_suspend(struct platform_device *pdev,
return 0;
}

static int loopback_resume(struct platform_device *pdev)
static int loopback_resume(struct device *pdev)
{
struct snd_card *card = platform_get_drvdata(pdev);
struct snd_card *card = dev_get_drvdata(pdev);

snd_power_change_state(card, SNDRV_CTL_POWER_D0);
return 0;
}

static SIMPLE_DEV_PM_OPS(loopback_pm, loopback_suspend, loopback_resume);
#define LOOPBACK_PM_OPS &loopback_pm
#else
#define LOOPBACK_PM_OPS NULL
#endif

#define SND_LOOPBACK_DRIVER "snd_aloop"

static struct platform_driver loopback_driver = {
.probe = loopback_probe,
.remove = __devexit_p(loopback_remove),
#ifdef CONFIG_PM
.suspend = loopback_suspend,
.resume = loopback_resume,
#endif
.driver = {
.name = SND_LOOPBACK_DRIVER,
.owner = THIS_MODULE,
.pm = LOOPBACK_PM_OPS,
},
};

Expand Down
18 changes: 10 additions & 8 deletions sound/drivers/dummy.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1065,37 +1065,39 @@ static int __devexit snd_dummy_remove(struct platform_device *devptr)
}

#ifdef CONFIG_PM
static int snd_dummy_suspend(struct platform_device *pdev, pm_message_t state)
static int snd_dummy_suspend(struct device *pdev)
{
struct snd_card *card = platform_get_drvdata(pdev);
struct snd_card *card = dev_get_drvdata(pdev);
struct snd_dummy *dummy = card->private_data;

snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);
snd_pcm_suspend_all(dummy->pcm);
return 0;
}

static int snd_dummy_resume(struct platform_device *pdev)
static int snd_dummy_resume(struct device *pdev)
{
struct snd_card *card = platform_get_drvdata(pdev);
struct snd_card *card = dev_get_drvdata(pdev);

snd_power_change_state(card, SNDRV_CTL_POWER_D0);
return 0;
}

static SIMPLE_DEV_PM_OPS(snd_dummy_pm, snd_dummy_suspend, snd_dummy_resume);
#define SND_DUMMY_PM_OPS &snd_dummy_pm
#else
#define SND_DUMMY_PM_OPS NULL
#endif

#define SND_DUMMY_DRIVER "snd_dummy"

static struct platform_driver snd_dummy_driver = {
.probe = snd_dummy_probe,
.remove = __devexit_p(snd_dummy_remove),
#ifdef CONFIG_PM
.suspend = snd_dummy_suspend,
.resume = snd_dummy_resume,
#endif
.driver = {
.name = SND_DUMMY_DRIVER,
.owner = THIS_MODULE,
.pm = SND_DUMMY_PM_OPS,
},
};

Expand Down
11 changes: 7 additions & 4 deletions sound/drivers/pcsp/pcsp.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -200,15 +200,18 @@ static void pcsp_stop_beep(struct snd_pcsp *chip)
}

#ifdef CONFIG_PM
static int pcsp_suspend(struct platform_device *dev, pm_message_t state)
static int pcsp_suspend(struct device *dev)
{
struct snd_pcsp *chip = platform_get_drvdata(dev);
struct snd_pcsp *chip = dev_get_drvdata(dev);
pcsp_stop_beep(chip);
snd_pcm_suspend_all(chip->pcm);
return 0;
}

static SIMPLE_DEV_PM_OPS(pcsp_pm, pcsp_suspend, NULL);
#define PCSP_PM_OPS &pcsp_pm
#else
#define pcsp_suspend NULL
#define PCSP_PM_OPS NULL
#endif /* CONFIG_PM */

static void pcsp_shutdown(struct platform_device *dev)
Expand All @@ -221,10 +224,10 @@ static struct platform_driver pcsp_platform_driver = {
.driver = {
.name = "pcspkr",
.owner = THIS_MODULE,
.pm = PCSP_PM_OPS,
},
.probe = pcsp_probe,
.remove = __devexit_p(pcsp_remove),
.suspend = pcsp_suspend,
.shutdown = pcsp_shutdown,
};

Expand Down
18 changes: 10 additions & 8 deletions sound/ppc/powermac.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -144,33 +144,35 @@ 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"

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,
.owner = THIS_MODULE,
.pm = SND_PMAC_PM_OPS,
},
};

Expand Down

0 comments on commit 284e7ca

Please sign in to comment.