From: Jarkko Nikula <jarkko.nikula@linux.intel.com>
To: alsa-devel@alsa-project.org
Cc: Mark Brown <broonie@kernel.org>,
Jarkko Nikula <jarkko.nikula@linux.intel.com>,
Liam Girdwood <lgirdwood@gmail.com>
Subject: [PATCH 4/4] ASoC: Intel: byt-rt5640: Use card PM ops from core
Date: Mon, 26 May 2014 16:56:33 +0300 [thread overview]
Message-ID: <1401112593-2852-4-git-send-email-jarkko.nikula@linux.intel.com> (raw)
In-Reply-To: <1401112593-2852-1-git-send-email-jarkko.nikula@linux.intel.com>
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>
---
sound/soc/intel/byt-rt5640.c | 13 +------------
1 file changed, 1 insertion(+), 12 deletions(-)
diff --git a/sound/soc/intel/byt-rt5640.c b/sound/soc/intel/byt-rt5640.c
index eac6566f42e6..ac52c77721b1 100644
--- a/sound/soc/intel/byt-rt5640.c
+++ b/sound/soc/intel/byt-rt5640.c
@@ -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;
@@ -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)
--
2.0.0.rc2
prev parent reply other threads:[~2014-05-26 13:56 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-05-26 13:56 [PATCH 1/4] ASoC: Intel: Clear stored Baytrail DSP DMA pointer before stream start Jarkko Nikula
2014-05-26 13:56 ` [PATCH 2/4] ASoC: Intel: remove duplicate headers Jarkko Nikula
2014-05-26 13:56 ` [PATCH 3/4] ASoC: Intel: Use devm_snd_soc_unregister_card Jarkko Nikula
2014-05-28 9:35 ` [PATCHv2 3/4] ASoC: Intel: Use devm_snd_soc_register_card Jarkko Nikula
2014-06-01 10:52 ` Mark Brown
2014-05-26 13:56 ` Jarkko Nikula [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1401112593-2852-4-git-send-email-jarkko.nikula@linux.intel.com \
--to=jarkko.nikula@linux.intel.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=lgirdwood@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.