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/wm8985.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/sound/soc/codecs/wm8985.c b/sound/soc/codecs/wm8985.c index bcf3473..8eec022 100644 --- a/sound/soc/codecs/wm8985.c +++ b/sound/soc/codecs/wm8985.c @@ -1026,9 +1026,10 @@ static int wm8985_set_bias_level(struct snd_soc_codec *codec, return 0; }
-static int wm8985_probe(struct snd_soc_codec *codec) +static int wm8985_probe(struct snd_soc_component *component) { size_t i; + struct snd_soc_codec *codec = snd_soc_component_to_codec(component); struct wm8985_priv *wm8985; int ret;
@@ -1106,11 +1107,11 @@ static struct snd_soc_dai_driver wm8985_dai = { };
static struct snd_soc_codec_driver soc_codec_dev_wm8985 = { - .probe = wm8985_probe, .set_bias_level = wm8985_set_bias_level, .suspend_bias_off = true,
.component_driver = { + .probe = wm8985_probe, .controls = wm8985_common_snd_controls, .num_controls = ARRAY_SIZE(wm8985_common_snd_controls), .dapm_widgets = wm8985_common_dapm_widgets,