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/wm8737.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/sound/soc/codecs/wm8737.c b/sound/soc/codecs/wm8737.c index 728c42c..9670959 100644 --- a/sound/soc/codecs/wm8737.c +++ b/sound/soc/codecs/wm8737.c @@ -537,8 +537,9 @@ static struct snd_soc_dai_driver wm8737_dai = { .ops = &wm8737_dai_ops, };
-static int wm8737_probe(struct snd_soc_codec *codec) +static int wm8737_probe(struct snd_soc_component *component) { + struct snd_soc_codec *codec = snd_soc_component_to_codec(component); struct wm8737_priv *wm8737 = snd_soc_codec_get_drvdata(codec); int ret;
@@ -574,11 +575,11 @@ err_get: }
static struct snd_soc_codec_driver soc_codec_dev_wm8737 = { - .probe = wm8737_probe, .set_bias_level = wm8737_set_bias_level, .suspend_bias_off = true,
.component_driver = { + .probe = wm8737_probe, .controls = wm8737_snd_controls, .num_controls = ARRAY_SIZE(wm8737_snd_controls), .dapm_widgets = wm8737_dapm_widgets,