p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ALSA: AACI: Convert to modern PM ops 

Even if the CONFIG_PM explicity is undefined, let's convert to the
modern PM ops.

Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Ulf Hansson 2013-12-03 11:04:26 +01:00 committed by Takashi Iwai
parent 84d2dc3e57
commit b13a714923
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
sound/arm/aaci.c
View File

@ -753,7 +753,7 @@ static struct snd_pcm_ops aaci_capture_ops = {
* Power Management. * Power Management.
*/ */
#ifdef CONFIG_PM #ifdef CONFIG_PM
static int aaci_do_suspend(struct snd_card *card, unsigned int state) static int aaci_do_suspend(struct snd_card *card)
{ {
struct aaci *aaci = card->private_data; struct aaci *aaci = card->private_data;
snd_power_change_state(card, SNDRV_CTL_POWER_D3cold); snd_power_change_state(card, SNDRV_CTL_POWER_D3cold);
@ -761,28 +761,28 @@ static int aaci_do_suspend(struct snd_card *card, unsigned int state)
return 0; return 0;
} }
static int aaci_do_resume(struct snd_card *card, unsigned int state) static int aaci_do_resume(struct snd_card *card)
{ {
snd_power_change_state(card, SNDRV_CTL_POWER_D0); snd_power_change_state(card, SNDRV_CTL_POWER_D0);
return 0; return 0;
} }
static int aaci_suspend(struct amba_device *dev, pm_message_t state) static int aaci_suspend(struct device *dev)
{ {
struct snd_card *card = amba_get_drvdata(dev); struct snd_card *card = dev_get_drvdata(dev);
return card ? aaci_do_suspend(card) : 0; return card ? aaci_do_suspend(card) : 0;
} }
static int aaci_resume(struct amba_device *dev) static int aaci_resume(struct device *dev)
{ {
struct snd_card *card = amba_get_drvdata(dev); struct snd_card *card = dev_get_drvdata(dev);
return card ? aaci_do_resume(card) : 0; return card ? aaci_do_resume(card) : 0;
} }
static SIMPLE_DEV_PM_OPS(aaci_dev_pm_ops, aaci_suspend, aaci_resume);
#define AACI_DEV_PM_OPS (&aaci_dev_pm_ops)
#else #else
#define aaci_do_suspend NULL #define AACI_DEV_PM_OPS NULL
#define aaci_do_resume NULL
#define aaci_suspend NULL
#define aaci_resume NULL
#endif #endif
@ -1100,11 +1100,10 @@ MODULE_DEVICE_TABLE(amba, aaci_ids);
static struct amba_driver aaci_driver = { static struct amba_driver aaci_driver = {
.drv = { .drv = {
.name = DRIVER_NAME, .name = DRIVER_NAME,
.pm = AACI_DEV_PM_OPS,
}, },
.probe = aaci_probe, .probe = aaci_probe,
.remove = aaci_remove, .remove = aaci_remove,
.suspend = aaci_suspend,
.resume = aaci_resume,
.id_table = aaci_ids, .id_table = aaci_ids,
}; };