iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ASoC: ac97: Drop support for setting platform data via the CPU DAI

Browse Source 
This has no users since commit f0fba2ad1b ("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>
This commit is contained in:
Lars-Peter Clausen 2014-11-10 22:41:49 +01:00 committed by Mark Brown
parent bdfd60e3c0
commit ca005f324e
4 changed files with 0 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/sound/soc-dai.h
View File

@ -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;

3
include/sound/soc.h
View File

@ -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)
{

12
sound/soc/soc-ac97.c
View File

@ -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);
}
}

2
sound/soc/soc-core.c
View File

@ -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;
}