diff options
author | Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> | 2013-10-17 06:01:37 -0400 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2013-10-17 19:35:00 -0400 |
commit | 7db1698f728e1176cc7869f22565e3faa8ec2b72 (patch) | |
tree | 4f55f001e7c9131060c27b3cccbce67587633dd0 /sound/soc/pxa | |
parent | f62aa9b6c900a9aaf302c1f9ac1883c143afd832 (diff) |
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>
Diffstat (limited to 'sound/soc/pxa')
-rw-r--r-- | sound/soc/pxa/brownstone.c | 1 | ||||
-rw-r--r-- | sound/soc/pxa/corgi.c | 1 | ||||
-rw-r--r-- | sound/soc/pxa/e740_wm9705.c | 1 | ||||
-rw-r--r-- | sound/soc/pxa/e750_wm9705.c | 1 | ||||
-rw-r--r-- | sound/soc/pxa/e800_wm9712.c | 1 | ||||
-rw-r--r-- | sound/soc/pxa/imote2.c | 1 | ||||
-rw-r--r-- | sound/soc/pxa/mioa701_wm9713.c | 1 | ||||
-rw-r--r-- | sound/soc/pxa/palm27x.c | 1 | ||||
-rw-r--r-- | sound/soc/pxa/poodle.c | 1 | ||||
-rw-r--r-- | sound/soc/pxa/tosa.c | 1 | ||||
-rw-r--r-- | sound/soc/pxa/ttc-dkb.c | 1 |
11 files changed, 11 insertions, 0 deletions
diff --git a/sound/soc/pxa/brownstone.c b/sound/soc/pxa/brownstone.c index 5b7d969f89a9..08acdc236bf8 100644 --- a/sound/soc/pxa/brownstone.c +++ b/sound/soc/pxa/brownstone.c | |||
@@ -163,6 +163,7 @@ static struct platform_driver mmp_driver = { | |||
163 | .driver = { | 163 | .driver = { |
164 | .name = "brownstone-audio", | 164 | .name = "brownstone-audio", |
165 | .owner = THIS_MODULE, | 165 | .owner = THIS_MODULE, |
166 | .pm = &snd_soc_pm_ops, | ||
166 | }, | 167 | }, |
167 | .probe = brownstone_probe, | 168 | .probe = brownstone_probe, |
168 | .remove = brownstone_remove, | 169 | .remove = brownstone_remove, |
diff --git a/sound/soc/pxa/corgi.c b/sound/soc/pxa/corgi.c index f4cce1e80112..1853d41034bf 100644 --- a/sound/soc/pxa/corgi.c +++ b/sound/soc/pxa/corgi.c | |||
@@ -329,6 +329,7 @@ static struct platform_driver corgi_driver = { | |||
329 | .driver = { | 329 | .driver = { |
330 | .name = "corgi-audio", | 330 | .name = "corgi-audio", |
331 | .owner = THIS_MODULE, | 331 | .owner = THIS_MODULE, |
332 | .pm = &snd_soc_pm_ops, | ||
332 | }, | 333 | }, |
333 | .probe = corgi_probe, | 334 | .probe = corgi_probe, |
334 | .remove = corgi_remove, | 335 | .remove = corgi_remove, |
diff --git a/sound/soc/pxa/e740_wm9705.c b/sound/soc/pxa/e740_wm9705.c index 70d799b13f0d..44b5c09d296b 100644 --- a/sound/soc/pxa/e740_wm9705.c +++ b/sound/soc/pxa/e740_wm9705.c | |||
@@ -178,6 +178,7 @@ static struct platform_driver e740_driver = { | |||
178 | .driver = { | 178 | .driver = { |
179 | .name = "e740-audio", | 179 | .name = "e740-audio", |
180 | .owner = THIS_MODULE, | 180 | .owner = THIS_MODULE, |
181 | .pm = &snd_soc_pm_ops, | ||
181 | }, | 182 | }, |
182 | .probe = e740_probe, | 183 | .probe = e740_probe, |
183 | .remove = e740_remove, | 184 | .remove = e740_remove, |
diff --git a/sound/soc/pxa/e750_wm9705.c b/sound/soc/pxa/e750_wm9705.c index f94d2ab51351..c34e447eb991 100644 --- a/sound/soc/pxa/e750_wm9705.c +++ b/sound/soc/pxa/e750_wm9705.c | |||
@@ -160,6 +160,7 @@ static struct platform_driver e750_driver = { | |||
160 | .driver = { | 160 | .driver = { |
161 | .name = "e750-audio", | 161 | .name = "e750-audio", |
162 | .owner = THIS_MODULE, | 162 | .owner = THIS_MODULE, |
163 | .pm = &snd_soc_pm_ops, | ||
163 | }, | 164 | }, |
164 | .probe = e750_probe, | 165 | .probe = e750_probe, |
165 | .remove = e750_remove, | 166 | .remove = e750_remove, |
diff --git a/sound/soc/pxa/e800_wm9712.c b/sound/soc/pxa/e800_wm9712.c index 8768a640dd71..3137f800b43f 100644 --- a/sound/soc/pxa/e800_wm9712.c +++ b/sound/soc/pxa/e800_wm9712.c | |||
@@ -150,6 +150,7 @@ static struct platform_driver e800_driver = { | |||
150 | .driver = { | 150 | .driver = { |
151 | .name = "e800-audio", | 151 | .name = "e800-audio", |
152 | .owner = THIS_MODULE, | 152 | .owner = THIS_MODULE, |
153 | .pm = &snd_soc_pm_ops, | ||
153 | }, | 154 | }, |
154 | .probe = e800_probe, | 155 | .probe = e800_probe, |
155 | .remove = e800_remove, | 156 | .remove = e800_remove, |
diff --git a/sound/soc/pxa/imote2.c b/sound/soc/pxa/imote2.c index eef1f7b7b38e..fd2f4eda1fd3 100644 --- a/sound/soc/pxa/imote2.c +++ b/sound/soc/pxa/imote2.c | |||
@@ -91,6 +91,7 @@ static struct platform_driver imote2_driver = { | |||
91 | .driver = { | 91 | .driver = { |
92 | .name = "imote2-audio", | 92 | .name = "imote2-audio", |
93 | .owner = THIS_MODULE, | 93 | .owner = THIS_MODULE, |
94 | .pm = &snd_soc_pm_ops, | ||
94 | }, | 95 | }, |
95 | .probe = imote2_probe, | 96 | .probe = imote2_probe, |
96 | .remove = imote2_remove, | 97 | .remove = imote2_remove, |
diff --git a/sound/soc/pxa/mioa701_wm9713.c b/sound/soc/pxa/mioa701_wm9713.c index bbea7780eac6..160c5245448f 100644 --- 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 = { | |||
215 | .driver = { | 215 | .driver = { |
216 | .name = "mioa701-wm9713", | 216 | .name = "mioa701-wm9713", |
217 | .owner = THIS_MODULE, | 217 | .owner = THIS_MODULE, |
218 | .pm = &snd_soc_pm_ops, | ||
218 | }, | 219 | }, |
219 | }; | 220 | }; |
220 | 221 | ||
diff --git a/sound/soc/pxa/palm27x.c b/sound/soc/pxa/palm27x.c index e1ffcdd9a649..3284c4b901cb 100644 --- a/sound/soc/pxa/palm27x.c +++ b/sound/soc/pxa/palm27x.c | |||
@@ -181,6 +181,7 @@ static struct platform_driver palm27x_wm9712_driver = { | |||
181 | .driver = { | 181 | .driver = { |
182 | .name = "palm27x-asoc", | 182 | .name = "palm27x-asoc", |
183 | .owner = THIS_MODULE, | 183 | .owner = THIS_MODULE, |
184 | .pm = &snd_soc_pm_ops, | ||
184 | }, | 185 | }, |
185 | }; | 186 | }; |
186 | 187 | ||
diff --git a/sound/soc/pxa/poodle.c b/sound/soc/pxa/poodle.c index fafe46355c31..c93e138d8dc3 100644 --- a/sound/soc/pxa/poodle.c +++ b/sound/soc/pxa/poodle.c | |||
@@ -303,6 +303,7 @@ static struct platform_driver poodle_driver = { | |||
303 | .driver = { | 303 | .driver = { |
304 | .name = "poodle-audio", | 304 | .name = "poodle-audio", |
305 | .owner = THIS_MODULE, | 305 | .owner = THIS_MODULE, |
306 | .pm = &snd_soc_pm_ops, | ||
306 | }, | 307 | }, |
307 | .probe = poodle_probe, | 308 | .probe = poodle_probe, |
308 | .remove = poodle_remove, | 309 | .remove = poodle_remove, |
diff --git a/sound/soc/pxa/tosa.c b/sound/soc/pxa/tosa.c index a3fe19123f07..1d9c2ed223bc 100644 --- a/sound/soc/pxa/tosa.c +++ b/sound/soc/pxa/tosa.c | |||
@@ -275,6 +275,7 @@ static struct platform_driver tosa_driver = { | |||
275 | .driver = { | 275 | .driver = { |
276 | .name = "tosa-audio", | 276 | .name = "tosa-audio", |
277 | .owner = THIS_MODULE, | 277 | .owner = THIS_MODULE, |
278 | .pm = &snd_soc_pm_ops, | ||
278 | }, | 279 | }, |
279 | .probe = tosa_probe, | 280 | .probe = tosa_probe, |
280 | .remove = tosa_remove, | 281 | .remove = tosa_remove, |
diff --git a/sound/soc/pxa/ttc-dkb.c b/sound/soc/pxa/ttc-dkb.c index 13c9ee0cb83b..0b535b570622 100644 --- 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 = { | |||
160 | .driver = { | 160 | .driver = { |
161 | .name = "ttc-dkb-audio", | 161 | .name = "ttc-dkb-audio", |
162 | .owner = THIS_MODULE, | 162 | .owner = THIS_MODULE, |
163 | .pm = &snd_soc_pm_ops, | ||
163 | }, | 164 | }, |
164 | .probe = ttc_dkb_probe, | 165 | .probe = ttc_dkb_probe, |
165 | .remove = ttc_dkb_remove, | 166 | .remove = ttc_dkb_remove, |