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/rt5677.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/sound/soc/codecs/rt5677.c b/sound/soc/codecs/rt5677.c index 68268f2..3818e6f 100644 --- a/sound/soc/codecs/rt5677.c +++ b/sound/soc/codecs/rt5677.c @@ -4704,8 +4704,9 @@ static void rt5677_free_gpio(struct i2c_client *i2c) } #endif
-static int rt5677_probe(struct snd_soc_codec *codec) +static int rt5677_probe(struct snd_soc_component *component) { + struct snd_soc_codec *codec = snd_soc_component_to_codec(component); struct snd_soc_dapm_context *dapm = snd_soc_codec_get_dapm(codec); struct rt5677_priv *rt5677 = snd_soc_codec_get_drvdata(codec); int i; @@ -4761,15 +4762,14 @@ static int rt5677_probe(struct snd_soc_codec *codec) return 0; }
-static int rt5677_remove(struct snd_soc_codec *codec) +static void rt5677_remove(struct snd_soc_component *component) { + struct snd_soc_codec *codec = snd_soc_component_to_codec(component); struct rt5677_priv *rt5677 = snd_soc_codec_get_drvdata(codec);
regmap_write(rt5677->regmap, RT5677_RESET, 0x10ec); gpiod_set_value_cansleep(rt5677->pow_ldo2, 0); gpiod_set_value_cansleep(rt5677->reset_pin, 1); - - return 0; }
#ifdef CONFIG_PM @@ -4968,13 +4968,13 @@ static struct snd_soc_dai_driver rt5677_dai[] = { };
static struct snd_soc_codec_driver soc_codec_dev_rt5677 = { - .probe = rt5677_probe, - .remove = rt5677_remove, .suspend = rt5677_suspend, .resume = rt5677_resume, .set_bias_level = rt5677_set_bias_level, .idle_bias_off = true, .component_driver = { + .probe = rt5677_probe, + .remove = rt5677_remove, .controls = rt5677_snd_controls, .num_controls = ARRAY_SIZE(rt5677_snd_controls), .dapm_widgets = rt5677_dapm_widgets,