Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ca005f32 authored by Lars-Peter Clausen's avatar Lars-Peter Clausen Committed by Mark Brown
Browse files

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



This has no users since commit f0fba2ad ("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: default avatarLars-Peter Clausen <lars@metafoo.de>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent bdfd60e3

include/sound/soc-dai.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -241,7 +241,6 @@ struct snd_soc_dai { 
	const char *name;

	const char *name;

	int id;

	int id;

	struct device *dev;

	struct device *dev;

	void *ac97_pdata;	/* platform_data for the ac97 codec */





	/* driver ops */

	/* driver ops */

	struct snd_soc_dai_driver *driver;

	struct snd_soc_dai_driver *driver;

include/sound/soc.h

+0 −3
Original line number Original line Diff line number Diff line
@@ -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;

extern struct snd_ac97_bus_ops *soc_ac97_ops;





int snd_soc_ac97_register_dai_links(struct snd_soc_card *card);

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

#else





static inline int snd_soc_ac97_register_dai_links(struct snd_soc_card *card)

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;

	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,

static inline int snd_soc_set_ac97_ops_of_reset(struct snd_ac97_bus_ops *ops,

	struct platform_device *pdev)

	struct platform_device *pdev)

{

{

sound/soc/soc-ac97.c

+0 −12
Original line number Original line Diff line number Diff line
@@ -342,15 +342,3 @@ int snd_soc_ac97_register_dai_links(struct snd_soc_card *card) 
		soc_unregister_ac97_dai_link(&card->rtd[i]);

		soc_unregister_ac97_dai_link(&card->rtd[i]);

	return ret;

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

	}

}

sound/soc/soc-core.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -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;

	return 0;

}

}