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/wm8978.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/sound/soc/codecs/wm8978.c b/sound/soc/codecs/wm8978.c index 910b36f..3c057b2 100644 --- a/sound/soc/codecs/wm8978.c +++ b/sound/soc/codecs/wm8978.c @@ -971,8 +971,9 @@ static const int update_reg[] = { WM8978_ROUT2_SPK_CONTROL, };
-static int wm8978_probe(struct snd_soc_codec *codec) +static int wm8978_probe(struct snd_soc_component *component) { + struct snd_soc_codec *codec = snd_soc_component_to_codec(component); struct wm8978_priv *wm8978 = snd_soc_codec_get_drvdata(codec); int i;
@@ -994,12 +995,12 @@ static int wm8978_probe(struct snd_soc_codec *codec) }
static struct snd_soc_codec_driver soc_codec_dev_wm8978 = { - .probe = wm8978_probe, .suspend = wm8978_suspend, .resume = wm8978_resume, .set_bias_level = wm8978_set_bias_level,
.component_driver = { + .probe = wm8978_probe, .controls = wm8978_snd_controls, .num_controls = ARRAY_SIZE(wm8978_snd_controls), .dapm_widgets = wm8978_dapm_widgets,