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/wm8776.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/sound/soc/codecs/wm8776.c b/sound/soc/codecs/wm8776.c index f17a3a8..6a4cf65 100644 --- a/sound/soc/codecs/wm8776.c +++ b/sound/soc/codecs/wm8776.c @@ -407,8 +407,9 @@ static struct snd_soc_dai_driver wm8776_dai[] = { }, };
-static int wm8776_probe(struct snd_soc_codec *codec) +static int wm8776_probe(struct snd_soc_component *component) { + struct snd_soc_codec *codec = snd_soc_component_to_codec(component); int ret = 0;
ret = wm8776_reset(codec); @@ -426,11 +427,11 @@ static int wm8776_probe(struct snd_soc_codec *codec) }
static struct snd_soc_codec_driver soc_codec_dev_wm8776 = { - .probe = wm8776_probe, .set_bias_level = wm8776_set_bias_level, .suspend_bias_off = true,
.component_driver = { + .probe = wm8776_probe, .controls = wm8776_snd_controls, .num_controls = ARRAY_SIZE(wm8776_snd_controls), .dapm_widgets = wm8776_dapm_widgets,