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/rt5659.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/sound/soc/codecs/rt5659.c b/sound/soc/codecs/rt5659.c index 59ddaf3..47e0758 100644 --- a/sound/soc/codecs/rt5659.c +++ b/sound/soc/codecs/rt5659.c @@ -3600,8 +3600,9 @@ static int rt5659_set_bias_level(struct snd_soc_codec *codec, return 0; }
-static int rt5659_probe(struct snd_soc_codec *codec) +static int rt5659_probe(struct snd_soc_component *component) { + struct snd_soc_codec *codec = snd_soc_component_to_codec(component); struct rt5659_priv *rt5659 = snd_soc_codec_get_drvdata(codec);
rt5659->codec = codec; @@ -3609,13 +3610,12 @@ static int rt5659_probe(struct snd_soc_codec *codec) return 0; }
-static int rt5659_remove(struct snd_soc_codec *codec) +static void rt5659_remove(struct snd_soc_component *component) { + struct snd_soc_codec *codec = snd_soc_component_to_codec(component); struct rt5659_priv *rt5659 = snd_soc_codec_get_drvdata(codec);
regmap_write(rt5659->regmap, RT5659_RESET, 0); - - return 0; }
#ifdef CONFIG_PM @@ -3716,13 +3716,13 @@ static struct snd_soc_dai_driver rt5659_dai[] = { };
static struct snd_soc_codec_driver soc_codec_dev_rt5659 = { - .probe = rt5659_probe, - .remove = rt5659_remove, .suspend = rt5659_suspend, .resume = rt5659_resume, .set_bias_level = rt5659_set_bias_level, .idle_bias_off = true, .component_driver = { + .probe = rt5659_probe, + .remove = rt5659_remove, .controls = rt5659_snd_controls, .num_controls = ARRAY_SIZE(rt5659_snd_controls), .dapm_widgets = rt5659_dapm_widgets,