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/max9850.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/sound/soc/codecs/max9850.c b/sound/soc/codecs/max9850.c index 0610840..36c6edd 100644 --- a/sound/soc/codecs/max9850.c +++ b/sound/soc/codecs/max9850.c @@ -289,8 +289,10 @@ static struct snd_soc_dai_driver max9850_dai = { .ops = &max9850_dai_ops, };
-static int max9850_probe(struct snd_soc_codec *codec) +static int max9850_probe(struct snd_soc_component *component) { + struct snd_soc_codec *codec = snd_soc_component_to_codec(component); + /* enable zero-detect */ snd_soc_update_bits(codec, MAX9850_GENERAL_PURPOSE, 1, 1); /* enable slew-rate control */ @@ -302,11 +304,11 @@ static int max9850_probe(struct snd_soc_codec *codec) }
static struct snd_soc_codec_driver soc_codec_dev_max9850 = { - .probe = max9850_probe, .set_bias_level = max9850_set_bias_level, .suspend_bias_off = true,
.component_driver = { + .probe = max9850_probe, .controls = max9850_controls, .num_controls = ARRAY_SIZE(max9850_controls), .dapm_widgets = max9850_dapm_widgets,