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/wm8971.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/sound/soc/codecs/wm8971.c b/sound/soc/codecs/wm8971.c index 214fa13..1419628 100644 --- a/sound/soc/codecs/wm8971.c +++ b/sound/soc/codecs/wm8971.c @@ -628,8 +628,9 @@ static struct snd_soc_dai_driver wm8971_dai = { .ops = &wm8971_dai_ops, };
-static int wm8971_probe(struct snd_soc_codec *codec) +static int wm8971_probe(struct snd_soc_component *component) { + struct snd_soc_codec *codec = snd_soc_component_to_codec(component); struct wm8971_priv *wm8971 = snd_soc_codec_get_drvdata(codec);
INIT_DELAYED_WORK(&wm8971->charge_work, wm8971_charge_work); @@ -650,11 +651,11 @@ static int wm8971_probe(struct snd_soc_codec *codec) }
static struct snd_soc_codec_driver soc_codec_dev_wm8971 = { - .probe = wm8971_probe, .set_bias_level = wm8971_set_bias_level, .suspend_bias_off = true,
.component_driver = { + .probe = wm8971_probe, .controls = wm8971_snd_controls, .num_controls = ARRAY_SIZE(wm8971_snd_controls), .dapm_widgets = wm8971_dapm_widgets,