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/cs35l33.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/sound/soc/codecs/cs35l33.c b/sound/soc/codecs/cs35l33.c index 6df29fa..b6574f1 100644 --- a/sound/soc/codecs/cs35l33.c +++ b/sound/soc/codecs/cs35l33.c @@ -778,8 +778,9 @@ err: return ret; }
-static int cs35l33_probe(struct snd_soc_codec *codec) +static int cs35l33_probe(struct snd_soc_component *component) { + struct snd_soc_codec *codec = snd_soc_component_to_codec(component); struct cs35l33_private *cs35l33 = snd_soc_codec_get_drvdata(codec);
cs35l33->codec = codec; @@ -832,12 +833,11 @@ static int cs35l33_probe(struct snd_soc_codec *codec) }
static struct snd_soc_codec_driver soc_codec_dev_cs35l33 = { - .probe = cs35l33_probe, - .set_bias_level = cs35l33_set_bias_level, .set_sysclk = cs35l33_codec_set_sysclk,
.component_driver = { + .probe = cs35l33_probe, .controls = cs35l33_snd_controls, .num_controls = ARRAY_SIZE(cs35l33_snd_controls), .dapm_widgets = cs35l33_dapm_widgets,