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/max98925.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/sound/soc/codecs/max98925.c b/sound/soc/codecs/max98925.c index 327eaa2..b8ca524 100644 --- a/sound/soc/codecs/max98925.c +++ b/sound/soc/codecs/max98925.c @@ -516,8 +516,9 @@ static struct snd_soc_dai_driver max98925_dai[] = { } };
-static int max98925_probe(struct snd_soc_codec *codec) +static int max98925_probe(struct snd_soc_component *component) { + struct snd_soc_codec *codec = snd_soc_component_to_codec(component); struct max98925_priv *max98925 = snd_soc_codec_get_drvdata(codec);
max98925->codec = codec; @@ -539,8 +540,8 @@ static int max98925_probe(struct snd_soc_codec *codec) }
static const struct snd_soc_codec_driver soc_codec_dev_max98925 = { - .probe = max98925_probe, .component_driver = { + .probe = max98925_probe, .controls = max98925_snd_controls, .num_controls = ARRAY_SIZE(max98925_snd_controls), .dapm_routes = max98925_audio_map,