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

ASoC: dapm: Remove platform field from widget and dapm context struct 



The platform field in the snd_soc_dapm_widget and snd_soc_dapm_context structs
is now unused can be removed. New code that wants to get the platform for a
widget or dapm context should use snd_soc_dapm_to_platform(w->dapm) or
snd_soc_dapm_to_platform(dapm).

Signed-off-by: default avatarLars-Peter Clausen <lars@metafoo.de>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent 9420d97b

include/sound/soc-dapm.h

+0 −2
Original line number Diff line number Diff line
@@ -526,7 +526,6 @@ struct snd_soc_dapm_widget { 
	const char *name;		/* widget name */

	const char *sname;	/* stream name */

	struct snd_soc_codec *codec;

	struct snd_soc_platform *platform;

	struct list_head list;

	struct snd_soc_dapm_context *dapm;
@@ -595,7 +594,6 @@ struct snd_soc_dapm_context { 
	struct device *dev; /* from parent - for debug */

	struct snd_soc_component *component; /* parent component */

	struct snd_soc_codec *codec; /* parent codec */

	struct snd_soc_platform *platform; /* parent platform */

	struct snd_soc_card *card; /* parent card */



	/* used during DAPM updates */

sound/soc/soc-core.c

+0 −1
Original line number Diff line number Diff line
@@ -4159,7 +4159,6 @@ int snd_soc_add_platform(struct device *dev, struct snd_soc_platform *platform, 


	platform->dev = dev;

	platform->driver = platform_drv;

	platform->component.dapm.platform = platform;

	if (platform_drv->write)

		platform->component.write = snd_soc_platform_drv_write;

	if (platform_drv->read)

sound/soc/soc-dapm.c

+0 −1
Original line number Diff line number Diff line
@@ -3097,7 +3097,6 @@ snd_soc_dapm_new_control(struct snd_soc_dapm_context *dapm, 


	w->dapm = dapm;

	w->codec = dapm->codec;

	w->platform = dapm->platform;

	INIT_LIST_HEAD(&w->sources);

	INIT_LIST_HEAD(&w->sinks);

	INIT_LIST_HEAD(&w->list);

CRA Git | Maintained and supported by SUSTech CRA and CCSE