Skip to content

Commit

Permalink
ASoC: ac97: Drop support for setting platform data via the CPU DAI
Browse files Browse the repository at this point in the history
This has no users since commit f0fba2a ("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>
  • Loading branch information
Lars-Peter Clausen authored and Mark Brown committed Nov 18, 2014
1 parent bdfd60e commit ca005f3
Show file tree
Hide file tree
Showing 4 changed files with 0 additions and 18 deletions.
1 change: 0 additions & 1 deletion include/sound/soc-dai.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
3 changes: 0 additions & 3 deletions include/sound/soc.h
Original file line number Diff line number Diff line change
Expand Up @@ -509,16 +509,13 @@ 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)
{
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)
{
Expand Down
12 changes: 0 additions & 12 deletions sound/soc/soc-ac97.c
Original file line number Diff line number Diff line change
Expand Up @@ -342,15 +342,3 @@ int snd_soc_ac97_register_dai_links(struct snd_soc_card *card)
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 changes: 0 additions & 2 deletions sound/soc/soc-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down

0 comments on commit ca005f3

Please sign in to comment.