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/ac97.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/sound/soc/codecs/ac97.c b/sound/soc/codecs/ac97.c index f7f04c6..a541c85 100644 --- a/sound/soc/codecs/ac97.c +++ b/sound/soc/codecs/ac97.c @@ -65,8 +65,9 @@ static struct snd_soc_dai_driver ac97_dai = { .ops = &ac97_dai_ops, };
-static int ac97_soc_probe(struct snd_soc_codec *codec) +static int ac97_soc_probe(struct snd_soc_component *component) { + struct snd_soc_codec *codec = snd_soc_component_to_codec(component); struct snd_ac97 *ac97; struct snd_ac97_bus *ac97_bus; struct snd_ac97_template ac97_template; @@ -113,11 +114,11 @@ static int ac97_soc_resume(struct snd_soc_codec *codec) #endif
static struct snd_soc_codec_driver soc_codec_dev_ac97 = { - .probe = ac97_soc_probe, .suspend = ac97_soc_suspend, .resume = ac97_soc_resume,
.component_driver = { + .probe = ac97_soc_probe, .dapm_widgets = ac97_widgets, .num_dapm_widgets = ARRAY_SIZE(ac97_widgets), .dapm_routes = ac97_routes,