diff options
| author | Lars-Peter Clausen <lars@metafoo.de> | 2015-01-15 06:52:17 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-01-15 06:57:34 -0500 |
| commit | 96da4e5b2e1d04478fb6d540085f2859256ca788 (patch) | |
| tree | 185d96142da2d784c8e688130640dcaff88e99b4 | |
| parent | 46f20872bc22c7513027dea09ac8d87f88e7e730 (diff) | |
ASoC: Remove codec field from snd_soc_dapm_widget
There are no more users of this field left so it can finally be removed.
New users should use snd_soc_dapm_to_codec(w->dapm);
The reason why it is removed is because it doesn't fit to well anymore in
the componentized ASoC hierarchy, where DAPM works on the snd_soc_component
level. And the alternative of snd_soc_dapm_to_codec(w->dapm) typically
generates the same amount of code, so there is really no reason to keep it.
For automatic conversion the following coccinelle semantic patch can be used:
// <smpl>
@@
struct snd_soc_dapm_widget *w;
@@
-w->codec
+snd_soc_dapm_to_codec(w->dapm)
// </smpl>
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@kernel.org>
| -rw-r--r-- | include/sound/soc-dapm.h | 1 | ||||
| -rw-r--r-- | sound/soc/soc-dapm.c | 2 |
2 files changed, 0 insertions, 3 deletions
diff --git a/include/sound/soc-dapm.h b/include/sound/soc-dapm.h index 89823cfe6f04..cc7104ab9660 100644 --- a/include/sound/soc-dapm.h +++ b/include/sound/soc-dapm.h | |||
| @@ -526,7 +526,6 @@ struct snd_soc_dapm_widget { | |||
| 526 | enum snd_soc_dapm_type id; | 526 | enum snd_soc_dapm_type id; |
| 527 | const char *name; /* widget name */ | 527 | const char *name; /* widget name */ |
| 528 | const char *sname; /* stream name */ | 528 | const char *sname; /* stream name */ |
| 529 | struct snd_soc_codec *codec; | ||
| 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 | ||
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index c5136bb1f982..f6ae254e33ef 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c | |||
| @@ -3130,8 +3130,6 @@ snd_soc_dapm_new_control(struct snd_soc_dapm_context *dapm, | |||
| 3130 | } | 3130 | } |
| 3131 | 3131 | ||
| 3132 | w->dapm = dapm; | 3132 | w->dapm = dapm; |
| 3133 | if (dapm->component) | ||
| 3134 | w->codec = dapm->component->codec; | ||
| 3135 | INIT_LIST_HEAD(&w->sources); | 3133 | INIT_LIST_HEAD(&w->sources); |
| 3136 | INIT_LIST_HEAD(&w->sinks); | 3134 | INIT_LIST_HEAD(&w->sinks); |
| 3137 | INIT_LIST_HEAD(&w->list); | 3135 | INIT_LIST_HEAD(&w->list); |
