aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars-Peter Clausen <lars@metafoo.de>2014-11-10 16:41:49 -0500
committerMark Brown <broonie@kernel.org>2014-11-18 10:37:58 -0500
commitca005f324ee38308b319c693f40523d959027acf (patch)
tree7e8abc28b18db78baf1e98c5c8bf9ce186be9f75
parentbdfd60e3c0affb914549f1d22e8aeef71e7828e6 (diff)
ASoC: ac97: Drop support for setting platform data via the CPU DAI
This has no users since commit f0fba2ad1b6b ("ASoC: multi-component - ASoC Multi-Component Support") which was almost 5 years ago. Given that this runs after CODEC probe functions have been run it also doesn't seem to be that useful. So drop it altogether to make the code simpler. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r--include/sound/soc-dai.h1
-rw-r--r--include/sound/soc.h3
-rw-r--r--sound/soc/soc-ac97.c12
-rw-r--r--sound/soc/soc-core.c2
4 files changed, 0 insertions, 18 deletions
diff --git a/include/sound/soc-dai.h b/include/sound/soc-dai.h
index e8b3080d196a..c0e04688c6ed 100644
--- a/include/sound/soc-dai.h
+++ b/include/sound/soc-dai.h
@@ -241,7 +241,6 @@ struct snd_soc_dai {
241 const char *name; 241 const char *name;
242 int id; 242 int id;
243 struct device *dev; 243 struct device *dev;
244 void *ac97_pdata; /* platform_data for the ac97 codec */
245 244
246 /* driver ops */ 245 /* driver ops */
247 struct snd_soc_dai_driver *driver; 246 struct snd_soc_dai_driver *driver;
diff --git a/include/sound/soc.h b/include/sound/soc.h
index 44b3ce531fd6..5b4dec693ca5 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -509,7 +509,6 @@ int snd_soc_set_ac97_ops_of_reset(struct snd_ac97_bus_ops *ops,
509extern struct snd_ac97_bus_ops *soc_ac97_ops; 509extern struct snd_ac97_bus_ops *soc_ac97_ops;
510 510
511int snd_soc_ac97_register_dai_links(struct snd_soc_card *card); 511int snd_soc_ac97_register_dai_links(struct snd_soc_card *card);
512void snd_soc_ac97_add_pdata(struct snd_soc_pcm_runtime *rtd);
513#else 512#else
514 513
515static inline int snd_soc_ac97_register_dai_links(struct snd_soc_card *card) 514static inline int snd_soc_ac97_register_dai_links(struct snd_soc_card *card)
@@ -517,8 +516,6 @@ static inline int snd_soc_ac97_register_dai_links(struct snd_soc_card *card)
517 return 0; 516 return 0;
518} 517}
519 518
520static inline void snd_soc_ac97_add_pdata(struct snd_soc_pcm_runtime *rtd) {}
521
522static inline int snd_soc_set_ac97_ops_of_reset(struct snd_ac97_bus_ops *ops, 519static inline int snd_soc_set_ac97_ops_of_reset(struct snd_ac97_bus_ops *ops,
523 struct platform_device *pdev) 520 struct platform_device *pdev)
524{ 521{
diff --git a/sound/soc/soc-ac97.c b/sound/soc/soc-ac97.c
index b5d23c976662..f2ed77b5169a 100644
--- a/sound/soc/soc-ac97.c
+++ b/sound/soc/soc-ac97.c
@@ -342,15 +342,3 @@ err:
342 soc_unregister_ac97_dai_link(&card->rtd[i]); 342 soc_unregister_ac97_dai_link(&card->rtd[i]);
343 return ret; 343 return ret;
344} 344}
345
346void snd_soc_ac97_add_pdata(struct snd_soc_pcm_runtime *rtd)
347{
348 unsigned int i;
349
350 /* add platform data for AC97 devices */
351 for (i = 0; i < rtd->num_codecs; i++) {
352 if (rtd->codec_dais[i]->driver->ac97_control)
353 snd_ac97_dev_add_pdata(rtd->codec_dais[i]->codec->ac97,
354 rtd->cpu_dai->ac97_pdata);
355 }
356}
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 026722f5ebf4..d883b4ad03ac 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -1375,8 +1375,6 @@ static int soc_probe_link_dais(struct snd_soc_card *card, int num, int order)
1375 } 1375 }
1376 } 1376 }
1377 1377
1378 snd_soc_ac97_add_pdata(rtd);
1379
1380 return 0; 1378 return 0;
1381} 1379}
1382 1380