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/alc5632.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/sound/soc/codecs/alc5632.c b/sound/soc/codecs/alc5632.c index adb80d8..7ead9bc 100644 --- a/sound/soc/codecs/alc5632.c +++ b/sound/soc/codecs/alc5632.c @@ -1050,8 +1050,9 @@ static int alc5632_resume(struct snd_soc_codec *codec) #define alc5632_resume NULL #endif
-static int alc5632_probe(struct snd_soc_codec *codec) +static int alc5632_probe(struct snd_soc_component *component) { + struct snd_soc_codec *codec = snd_soc_component_to_codec(component); struct alc5632_priv *alc5632 = snd_soc_codec_get_drvdata(codec);
switch (alc5632->id) { @@ -1067,12 +1068,12 @@ static int alc5632_probe(struct snd_soc_codec *codec) }
static const struct snd_soc_codec_driver soc_codec_device_alc5632 = { - .probe = alc5632_probe, .resume = alc5632_resume, .set_bias_level = alc5632_set_bias_level, .suspend_bias_off = true,
.component_driver = { + .probe = alc5632_probe, .controls = alc5632_snd_controls, .num_controls = ARRAY_SIZE(alc5632_snd_controls), .dapm_widgets = alc5632_dapm_widgets,