ALSA: ASoC: pxa: add asoc pm callbacks to pxa audio drivers

After convertion to snd_soc_register_card, platform driver should
reference snd_soc_pm_ops callbacks to properly suspend/resume sound
hardware. This was missed during conversion of PXA sound devices.

Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Signed-off-by: Mark Brown <broonie@linaro.org>

diff --git a/sound/soc/pxa/brownstone.c b/sound/soc/pxa/brownstone.c
index 5b7d969f89a96eebd418687ef5b7abc79d74ee97..08acdc236bf8479259b33068716c21ac5aace275 100644 (file)
--- a/sound/soc/pxa/brownstone.c
+++ b/sound/soc/pxa/brownstone.c
@@ -163,6 +163,7 @@ static struct platform_driver mmp_driver = {
        .driver         = {
                .name   = "brownstone-audio",
                .owner  = THIS_MODULE,
+               .pm     = &snd_soc_pm_ops,
        },
        .probe          = brownstone_probe,
        .remove         = brownstone_remove,

diff --git a/sound/soc/pxa/corgi.c b/sound/soc/pxa/corgi.c
index f4cce1e8011242364807ebe21dc15b74acb1e3c7..1853d41034bfa0c17d752f6191e4346e1cc06725 100644 (file)
--- a/sound/soc/pxa/corgi.c
+++ b/sound/soc/pxa/corgi.c
@@ -329,6 +329,7 @@ static struct platform_driver corgi_driver = {
        .driver         = {
                .name   = "corgi-audio",
                .owner  = THIS_MODULE,
+               .pm     = &snd_soc_pm_ops,
        },
        .probe          = corgi_probe,
        .remove         = corgi_remove,

diff --git a/sound/soc/pxa/e740_wm9705.c b/sound/soc/pxa/e740_wm9705.c
index 70d799b13f0d3fed2464c61046eb3e7439ebd8e4..44b5c09d296be62889649c5157dd098d12013deb 100644 (file)
--- a/sound/soc/pxa/e740_wm9705.c
+++ b/sound/soc/pxa/e740_wm9705.c
@@ -178,6 +178,7 @@ static struct platform_driver e740_driver = {
        .driver         = {
                .name   = "e740-audio",
                .owner  = THIS_MODULE,
+               .pm     = &snd_soc_pm_ops,
        },
        .probe          = e740_probe,
        .remove         = e740_remove,

diff --git a/sound/soc/pxa/e750_wm9705.c b/sound/soc/pxa/e750_wm9705.c
index f94d2ab51351b63932ff6e62d434cb08671dcc54..c34e447eb9911202ca5b6fbcaa78704f1103468a 100644 (file)
--- a/sound/soc/pxa/e750_wm9705.c
+++ b/sound/soc/pxa/e750_wm9705.c
@@ -160,6 +160,7 @@ static struct platform_driver e750_driver = {
        .driver         = {
                .name   = "e750-audio",
                .owner  = THIS_MODULE,
+               .pm     = &snd_soc_pm_ops,
        },
        .probe          = e750_probe,
        .remove         = e750_remove,

diff --git a/sound/soc/pxa/e800_wm9712.c b/sound/soc/pxa/e800_wm9712.c
index 8768a640dd71953a0c78b43d0df539d0b5c6ad18..3137f800b43f139a2c41adcfb3edc7981aae347a 100644 (file)
--- a/sound/soc/pxa/e800_wm9712.c
+++ b/sound/soc/pxa/e800_wm9712.c
@@ -150,6 +150,7 @@ static struct platform_driver e800_driver = {
        .driver         = {
                .name   = "e800-audio",
                .owner  = THIS_MODULE,
+               .pm     = &snd_soc_pm_ops,
        },
        .probe          = e800_probe,
        .remove         = e800_remove,

diff --git a/sound/soc/pxa/imote2.c b/sound/soc/pxa/imote2.c
index eef1f7b7b38e27c9ffcfb1b340df0f66d3173275..fd2f4eda1fd3f88d3945168f26fc6f5c57616506 100644 (file)
--- a/sound/soc/pxa/imote2.c
+++ b/sound/soc/pxa/imote2.c
@@ -91,6 +91,7 @@ static struct platform_driver imote2_driver = {
        .driver         = {
                .name   = "imote2-audio",
                .owner  = THIS_MODULE,
+               .pm     = &snd_soc_pm_ops,
        },
        .probe          = imote2_probe,
        .remove         = imote2_remove,

diff --git a/sound/soc/pxa/mioa701_wm9713.c b/sound/soc/pxa/mioa701_wm9713.c
index bbea7780eac640630803a024d3d0670b01c3c1eb..160c5245448f1e32303b240e47ab1e4616c25325 100644 (file)
--- a/sound/soc/pxa/mioa701_wm9713.c
+++ b/sound/soc/pxa/mioa701_wm9713.c
@@ -215,6 +215,7 @@ static struct platform_driver mioa701_wm9713_driver = {
        .driver         = {
                .name           = "mioa701-wm9713",
                .owner          = THIS_MODULE,
+               .pm     = &snd_soc_pm_ops,
        },
 };
 

diff --git a/sound/soc/pxa/palm27x.c b/sound/soc/pxa/palm27x.c
index e1ffcdd9a6492678c604ab045a7a981cae562971..3284c4b901cbfa740e75d633ddb1580698fdafb5 100644 (file)
--- a/sound/soc/pxa/palm27x.c
+++ b/sound/soc/pxa/palm27x.c
@@ -181,6 +181,7 @@ static struct platform_driver palm27x_wm9712_driver = {
        .driver         = {
                .name           = "palm27x-asoc",
                .owner          = THIS_MODULE,
+               .pm     = &snd_soc_pm_ops,
        },
 };
 

diff --git a/sound/soc/pxa/poodle.c b/sound/soc/pxa/poodle.c
index fafe46355c316b20df0f1e3fb114cae8d4cae9e2..c93e138d8dc3403f538c193d2bc1fc52794d9ad6 100644 (file)
--- a/sound/soc/pxa/poodle.c
+++ b/sound/soc/pxa/poodle.c
@@ -303,6 +303,7 @@ static struct platform_driver poodle_driver = {
        .driver         = {
                .name   = "poodle-audio",
                .owner  = THIS_MODULE,
+               .pm     = &snd_soc_pm_ops,
        },
        .probe          = poodle_probe,
        .remove         = poodle_remove,

diff --git a/sound/soc/pxa/tosa.c b/sound/soc/pxa/tosa.c
index a3fe19123f07218bbd8af8bb7bd1cf6a26af8067..1d9c2ed223bc089b233b748485c7b5a2e387ee49 100644 (file)
--- a/sound/soc/pxa/tosa.c
+++ b/sound/soc/pxa/tosa.c
@@ -275,6 +275,7 @@ static struct platform_driver tosa_driver = {
        .driver         = {
                .name   = "tosa-audio",
                .owner  = THIS_MODULE,
+               .pm     = &snd_soc_pm_ops,
        },
        .probe          = tosa_probe,
        .remove         = tosa_remove,

diff --git a/sound/soc/pxa/ttc-dkb.c b/sound/soc/pxa/ttc-dkb.c
index 13c9ee0cb83b988b06cb9b84963128b1cd703032..0b535b570622d3ad1fcffef4a6be13753f817385 100644 (file)
--- a/sound/soc/pxa/ttc-dkb.c
+++ b/sound/soc/pxa/ttc-dkb.c
@@ -160,6 +160,7 @@ static struct platform_driver ttc_dkb_driver = {
        .driver         = {
                .name   = "ttc-dkb-audio",
                .owner  = THIS_MODULE,
+               .pm     = &snd_soc_pm_ops,
        },
        .probe          = ttc_dkb_probe,
        .remove         = ttc_dkb_remove,