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/wm8983.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/sound/soc/codecs/wm8983.c b/sound/soc/codecs/wm8983.c index 9609fc0..7d816e2 100644 --- a/sound/soc/codecs/wm8983.c +++ b/sound/soc/codecs/wm8983.c @@ -913,8 +913,9 @@ static int wm8983_set_bias_level(struct snd_soc_codec *codec, return 0; }
-static int wm8983_probe(struct snd_soc_codec *codec) +static int wm8983_probe(struct snd_soc_component *component) { + struct snd_soc_codec *codec = snd_soc_component_to_codec(component); int ret; int i;
@@ -977,10 +978,10 @@ static struct snd_soc_dai_driver wm8983_dai = { };
static struct snd_soc_codec_driver soc_codec_dev_wm8983 = { - .probe = wm8983_probe, .set_bias_level = wm8983_set_bias_level, .suspend_bias_off = true, .component_driver = { + .probe = wm8983_probe, .controls = wm8983_snd_controls, .num_controls = ARRAY_SIZE(wm8983_snd_controls), .dapm_widgets = wm8983_dapm_widgets,