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: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@linaro.org>

diff --git a/include/sound/soc-dapm.h b/include/sound/soc-dapm.h
index e292683ee694ab0de622f8f1c52e6313fbfe02c3..aac04ff84eea5674279fd22984db6ca9b79ba8c7 100644 (file)
--- a/include/sound/soc-dapm.h
+++ b/include/sound/soc-dapm.h
@@ -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 */

diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 995a4b7f87eb473af99518d3749df0787ed9f496..19c1e9588e05704aa059b8e737e4e28216a63d03 100644 (file)
--- 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,
 
        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)

diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index 4702b926a6a043de512359a235b3c97ba47a9ddb..4bf08cffd1f17a82226703ae8eb22b1180fc0486 100644 (file)
--- 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,
 
        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);