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/adau1781.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/sound/soc/codecs/adau1781.c b/sound/soc/codecs/adau1781.c index 546071c..89c3c3e 100644 --- a/sound/soc/codecs/adau1781.c +++ b/sound/soc/codecs/adau1781.c @@ -380,8 +380,9 @@ static int adau1781_set_input_mode(struct adau *adau, unsigned int reg, ADAU1781_INPUT_DIFFERNTIAL, val); }
-static int adau1781_codec_probe(struct snd_soc_codec *codec) +static int adau1781_codec_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 adau1781_platform_data *pdata = dev_get_platdata(codec->dev); struct adau *adau = snd_soc_codec_get_drvdata(codec); @@ -427,12 +428,12 @@ static int adau1781_codec_probe(struct snd_soc_codec *codec) }
static const struct snd_soc_codec_driver adau1781_codec_driver = { - .probe = adau1781_codec_probe, .resume = adau17x1_resume, .set_bias_level = adau1781_set_bias_level, .suspend_bias_off = true,
.component_driver = { + .probe = adau1781_codec_probe, .controls = adau1781_controls, .num_controls = ARRAY_SIZE(adau1781_controls), .dapm_widgets = adau1781_dapm_widgets,