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/wm8961.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/sound/soc/codecs/wm8961.c b/sound/soc/codecs/wm8961.c index 4b51761..1f4db6e 100644 --- a/sound/soc/codecs/wm8961.c +++ b/sound/soc/codecs/wm8961.c @@ -830,8 +830,9 @@ static struct snd_soc_dai_driver wm8961_dai = { .ops = &wm8961_dai_ops, };
-static int wm8961_probe(struct snd_soc_codec *codec) +static int wm8961_probe(struct snd_soc_component *component) { + struct snd_soc_codec *codec = snd_soc_component_to_codec(component); u16 reg;
/* Enable class W */ @@ -883,12 +884,12 @@ static int wm8961_resume(struct snd_soc_codec *codec) #endif
static struct snd_soc_codec_driver soc_codec_dev_wm8961 = { - .probe = wm8961_probe, .resume = wm8961_resume, .set_bias_level = wm8961_set_bias_level, .suspend_bias_off = true,
.component_driver = { + .probe = wm8961_probe, .controls = wm8961_snd_controls, .num_controls = ARRAY_SIZE(wm8961_snd_controls), .dapm_widgets = wm8961_dapm_widgets,