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/rt5631.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/sound/soc/codecs/rt5631.c b/sound/soc/codecs/rt5631.c index 0e41808..f3a3c4e 100644 --- a/sound/soc/codecs/rt5631.c +++ b/sound/soc/codecs/rt5631.c @@ -1572,8 +1572,9 @@ static int rt5631_set_bias_level(struct snd_soc_codec *codec, return 0; }
-static int rt5631_probe(struct snd_soc_codec *codec) +static int rt5631_probe(struct snd_soc_component *component) { + struct snd_soc_codec *codec = snd_soc_component_to_codec(component); struct rt5631_priv *rt5631 = snd_soc_codec_get_drvdata(codec); unsigned int val;
@@ -1654,10 +1655,10 @@ static struct snd_soc_dai_driver rt5631_dai[] = { };
static struct snd_soc_codec_driver soc_codec_dev_rt5631 = { - .probe = rt5631_probe, .set_bias_level = rt5631_set_bias_level, .suspend_bias_off = true, .component_driver = { + .probe = rt5631_probe, .controls = rt5631_snd_controls, .num_controls = ARRAY_SIZE(rt5631_snd_controls), .dapm_widgets = rt5631_dapm_widgets,