Skip to content

Commit

Permalink
ASoC: Intel: byt-rt5640: Use card PM ops from core
Browse files Browse the repository at this point in the history
Use card PM ops from ASoC core instead of defining custom PM ops here since
we are calling anyway common suspend/resume callbacks.

Signed-off-by: Jarkko Nikula <jarkko.nikula@linux.intel.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
  • Loading branch information
Jarkko Nikula authored and Mark Brown committed Jun 1, 2014
1 parent 8eb776a commit 4af72f4
Showing 1 changed file with 1 addition and 12 deletions.
13 changes: 1 addition & 12 deletions sound/soc/intel/byt-rt5640.c
Original file line number Diff line number Diff line change
Expand Up @@ -138,17 +138,6 @@ static struct snd_soc_card byt_rt5640_card = {
.num_dapm_routes = ARRAY_SIZE(byt_rt5640_audio_map),
};

#ifdef CONFIG_PM_SLEEP
static const struct dev_pm_ops byt_rt5640_pm_ops = {
.suspend = snd_soc_suspend,
.resume = snd_soc_resume,
};

#define BYT_RT5640_PM_OPS (&byt_rt5640_pm_ops)
#else
#define BYT_RT5640_PM_OPS NULL
#endif

static int byt_rt5640_probe(struct platform_device *pdev)
{
struct snd_soc_card *card = &byt_rt5640_card;
Expand All @@ -162,7 +151,7 @@ static struct platform_driver byt_rt5640_audio = {
.driver = {
.name = "byt-rt5640",
.owner = THIS_MODULE,
.pm = BYT_RT5640_PM_OPS,
.pm = &snd_soc_pm_ops,
},
};
module_platform_driver(byt_rt5640_audio)
Expand Down

0 comments on commit 4af72f4

Please sign in to comment.