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/wm8770.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/sound/soc/codecs/wm8770.c b/sound/soc/codecs/wm8770.c index 8783a5f..c522c95 100644 --- a/sound/soc/codecs/wm8770.c +++ b/sound/soc/codecs/wm8770.c @@ -567,8 +567,9 @@ static struct snd_soc_dai_driver wm8770_dai = { .symmetric_rates = 1 };
-static int wm8770_probe(struct snd_soc_codec *codec) +static int wm8770_probe(struct snd_soc_component *component) { + struct snd_soc_codec *codec = snd_soc_component_to_codec(component); struct wm8770_priv *wm8770; int ret;
@@ -609,11 +610,11 @@ err_reg_enable: }
static struct snd_soc_codec_driver soc_codec_dev_wm8770 = { - .probe = wm8770_probe, .set_bias_level = wm8770_set_bias_level, .idle_bias_off = true,
.component_driver = { + .probe = wm8770_probe, .controls = wm8770_snd_controls, .num_controls = ARRAY_SIZE(wm8770_snd_controls), .dapm_widgets = wm8770_dapm_widgets,