aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/sound/soc-dapm.h2
-rw-r--r--sound/soc/soc-core.c1
-rw-r--r--sound/soc/soc-dapm.c1
3 files changed, 0 insertions, 4 deletions
diff --git a/include/sound/soc-dapm.h b/include/sound/soc-dapm.h
index e292683ee694..aac04ff84eea 100644
--- a/include/sound/soc-dapm.h
+++ b/include/sound/soc-dapm.h
@@ -526,7 +526,6 @@ struct snd_soc_dapm_widget {
526 const char *name; /* widget name */ 526 const char *name; /* widget name */
527 const char *sname; /* stream name */ 527 const char *sname; /* stream name */
528 struct snd_soc_codec *codec; 528 struct snd_soc_codec *codec;
529 struct snd_soc_platform *platform;
530 struct list_head list; 529 struct list_head list;
531 struct snd_soc_dapm_context *dapm; 530 struct snd_soc_dapm_context *dapm;
532 531
@@ -595,7 +594,6 @@ struct snd_soc_dapm_context {
595 struct device *dev; /* from parent - for debug */ 594 struct device *dev; /* from parent - for debug */
596 struct snd_soc_component *component; /* parent component */ 595 struct snd_soc_component *component; /* parent component */
597 struct snd_soc_codec *codec; /* parent codec */ 596 struct snd_soc_codec *codec; /* parent codec */
598 struct snd_soc_platform *platform; /* parent platform */
599 struct snd_soc_card *card; /* parent card */ 597 struct snd_soc_card *card; /* parent card */
600 598
601 /* used during DAPM updates */ 599 /* used during DAPM updates */
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 995a4b7f87eb..19c1e9588e05 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -4159,7 +4159,6 @@ int snd_soc_add_platform(struct device *dev, struct snd_soc_platform *platform,
4159 4159
4160 platform->dev = dev; 4160 platform->dev = dev;
4161 platform->driver = platform_drv; 4161 platform->driver = platform_drv;
4162 platform->component.dapm.platform = platform;
4163 if (platform_drv->write) 4162 if (platform_drv->write)
4164 platform->component.write = snd_soc_platform_drv_write; 4163 platform->component.write = snd_soc_platform_drv_write;
4165 if (platform_drv->read) 4164 if (platform_drv->read)
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index 4702b926a6a0..4bf08cffd1f1 100644
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -3097,7 +3097,6 @@ snd_soc_dapm_new_control(struct snd_soc_dapm_context *dapm,
3097 3097
3098 w->dapm = dapm; 3098 w->dapm = dapm;
3099 w->codec = dapm->codec; 3099 w->codec = dapm->codec;
3100 w->platform = dapm->platform;
3101 INIT_LIST_HEAD(&w->sources); 3100 INIT_LIST_HEAD(&w->sources);
3102 INIT_LIST_HEAD(&w->sinks); 3101 INIT_LIST_HEAD(&w->sinks);
3103 INIT_LIST_HEAD(&w->list); 3102 INIT_LIST_HEAD(&w->list);