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/wm2200.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/sound/soc/codecs/wm2200.c b/sound/soc/codecs/wm2200.c index d913d0e..1bc35dc 100644 --- a/sound/soc/codecs/wm2200.c +++ b/sound/soc/codecs/wm2200.c @@ -1548,8 +1548,9 @@ static const struct snd_soc_dapm_route wm2200_dapm_routes[] = { WM2200_MIXER_ROUTES("LHPF2", "LHPF2"), };
-static int wm2200_probe(struct snd_soc_codec *codec) +static int wm2200_probe(struct snd_soc_component *component) { + struct snd_soc_codec *codec = snd_soc_component_to_codec(component); struct wm2200_priv *wm2200 = dev_get_drvdata(codec->dev); int ret;
@@ -2104,14 +2105,13 @@ static struct snd_soc_dai_driver wm2200_dai = { };
static struct snd_soc_codec_driver soc_codec_wm2200 = { - .probe = wm2200_probe, - .idle_bias_off = true, .ignore_pmdown_time = true, .set_sysclk = wm2200_set_sysclk, .set_pll = wm2200_set_fll,
.component_driver = { + .probe = wm2200_probe, .controls = wm2200_snd_controls, .num_controls = ARRAY_SIZE(wm2200_snd_controls), .dapm_widgets = wm2200_dapm_widgets,