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/cs42xx8.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/sound/soc/codecs/cs42xx8.c b/sound/soc/codecs/cs42xx8.c index b4d8737..268decb 100644 --- a/sound/soc/codecs/cs42xx8.c +++ b/sound/soc/codecs/cs42xx8.c @@ -383,8 +383,9 @@ const struct regmap_config cs42xx8_regmap_config = { }; EXPORT_SYMBOL_GPL(cs42xx8_regmap_config);
-static int cs42xx8_codec_probe(struct snd_soc_codec *codec) +static int cs42xx8_codec_probe(struct snd_soc_component *component) { + struct snd_soc_codec *codec = snd_soc_component_to_codec(component); struct cs42xx8_priv *cs42xx8 = snd_soc_codec_get_drvdata(codec); struct snd_soc_dapm_context *dapm = snd_soc_codec_get_dapm(codec);
@@ -408,10 +409,10 @@ static int cs42xx8_codec_probe(struct snd_soc_codec *codec) }
static const struct snd_soc_codec_driver cs42xx8_driver = { - .probe = cs42xx8_codec_probe, .idle_bias_off = true,
.component_driver = { + .probe = cs42xx8_codec_probe, .controls = cs42xx8_snd_controls, .num_controls = ARRAY_SIZE(cs42xx8_snd_controls), .dapm_widgets = cs42xx8_dapm_widgets,