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/wm8955.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/sound/soc/codecs/wm8955.c b/sound/soc/codecs/wm8955.c index 575075d..e659e89 100644 --- a/sound/soc/codecs/wm8955.c +++ b/sound/soc/codecs/wm8955.c @@ -865,8 +865,9 @@ static struct snd_soc_dai_driver wm8955_dai = { .ops = &wm8955_dai_ops, };
-static int wm8955_probe(struct snd_soc_codec *codec) +static int wm8955_probe(struct snd_soc_component *component) { + struct snd_soc_codec *codec = snd_soc_component_to_codec(component); struct wm8955_priv *wm8955 = snd_soc_codec_get_drvdata(codec); struct wm8955_pdata *pdata = dev_get_platdata(codec->dev); int ret, i; @@ -941,11 +942,11 @@ err_enable: }
static struct snd_soc_codec_driver soc_codec_dev_wm8955 = { - .probe = wm8955_probe, .set_bias_level = wm8955_set_bias_level, .suspend_bias_off = true,
.component_driver = { + .probe = wm8955_probe, .controls = wm8955_snd_controls, .num_controls = ARRAY_SIZE(wm8955_snd_controls), .dapm_widgets = wm8955_dapm_widgets,