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>

diff --git a/include/sound/soc-dai.h b/include/sound/soc-dai.h
index e8b3080d196a7d6a336caa7b56ede832f4e44607..c0e04688c6ed3a28c81c9b10b7ae46590a191a52 100644 (file)
--- a/include/sound/soc-dai.h
+++ b/include/sound/soc-dai.h
@@ -241,7 +241,6 @@ struct snd_soc_dai {
        const char *name;
        int id;
        struct device *dev;
-       void *ac97_pdata;       /* platform_data for the ac97 codec */
 
        /* driver ops */
        struct snd_soc_dai_driver *driver;

diff --git a/include/sound/soc.h b/include/sound/soc.h
index 44b3ce531fd6e11e6b739579119335ccdd6c04cd..5b4dec693ca52b03f5044b8ec46478535779d759 100644 (file)
--- 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,
 extern struct snd_ac97_bus_ops *soc_ac97_ops;
 
 int snd_soc_ac97_register_dai_links(struct snd_soc_card *card);
-void snd_soc_ac97_add_pdata(struct snd_soc_pcm_runtime *rtd);
 #else
 
 static 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)
        return 0;
 }
 
-static inline void snd_soc_ac97_add_pdata(struct snd_soc_pcm_runtime *rtd) {}
-
 static inline int snd_soc_set_ac97_ops_of_reset(struct snd_ac97_bus_ops *ops,
        struct platform_device *pdev)
 {

diff --git a/sound/soc/soc-ac97.c b/sound/soc/soc-ac97.c
index b5d23c9766623b8477f8196362f8111e6c3501c1..f2ed77b5169a33506e29f7ef46cbb4ddf1bc09d9 100644 (file)
--- a/sound/soc/soc-ac97.c
+++ b/sound/soc/soc-ac97.c
@@ -342,15 +342,3 @@ err:
                soc_unregister_ac97_dai_link(&card->rtd[i]);
        return ret;
 }
-
-void snd_soc_ac97_add_pdata(struct snd_soc_pcm_runtime *rtd)
-{
-       unsigned int i;
-
-       /* add platform data for AC97 devices */
-       for (i = 0; i < rtd->num_codecs; i++) {
-               if (rtd->codec_dais[i]->driver->ac97_control)
-                       snd_ac97_dev_add_pdata(rtd->codec_dais[i]->codec->ac97,
-                                              rtd->cpu_dai->ac97_pdata);
-       }
-}

diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 026722f5ebf4196e0e243f34d4c62adb45b65131..d883b4ad03acd5231ba61fa4537c73b959dd339e 100644 (file)
--- 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)
                }
        }
 
-       snd_soc_ac97_add_pdata(rtd);
-
        return 0;
 }