From: Kuninori Morimoto kuninori.morimoto.gx@renesas.com
codec driver and component driver has duplicated .probe/.remove functions, and codec side is just relayed it. This was quick-hack, but no longer needed. This patch uses component .probe/.remove
Signed-off-by: Kuninori Morimoto kuninori.morimoto.gx@renesas.com --- sound/soc/codecs/wm8940.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/sound/soc/codecs/wm8940.c b/sound/soc/codecs/wm8940.c index 3c9febc..31302e0 100644 --- a/sound/soc/codecs/wm8940.c +++ b/sound/soc/codecs/wm8940.c @@ -693,8 +693,9 @@ static struct snd_soc_dai_driver wm8940_dai = { .symmetric_rates = 1, };
-static int wm8940_probe(struct snd_soc_codec *codec) +static int wm8940_probe(struct snd_soc_component *component) { + struct snd_soc_codec *codec = snd_soc_component_to_codec(component); struct wm8940_setup_data *pdata = codec->dev->platform_data; int ret; u16 reg; @@ -724,11 +725,11 @@ static int wm8940_probe(struct snd_soc_codec *codec) }
static struct snd_soc_codec_driver soc_codec_dev_wm8940 = { - .probe = wm8940_probe, .set_bias_level = wm8940_set_bias_level, .suspend_bias_off = true,
.component_driver = { + .probe = wm8940_probe, .controls = wm8940_snd_controls, .num_controls = ARRAY_SIZE(wm8940_snd_controls), .dapm_widgets = wm8940_dapm_widgets,