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/wm0010.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/sound/soc/codecs/wm0010.c b/sound/soc/codecs/wm0010.c index 4ef6919..2687b13 100644 --- a/sound/soc/codecs/wm0010.c +++ b/sound/soc/codecs/wm0010.c @@ -787,15 +787,24 @@ static int wm0010_set_sysclk(struct snd_soc_codec *codec, int source, return 0; }
-static int wm0010_probe(struct snd_soc_codec *codec); + +static int wm0010_probe(struct snd_soc_component *component) +{ + struct snd_soc_codec *codec = snd_soc_component_to_codec(component); + struct wm0010_priv *wm0010 = snd_soc_codec_get_drvdata(codec); + + wm0010->codec = codec; + + return 0; +}
static struct snd_soc_codec_driver soc_codec_dev_wm0010 = { - .probe = wm0010_probe, .set_bias_level = wm0010_set_bias_level, .set_sysclk = wm0010_set_sysclk, .idle_bias_off = true,
.component_driver = { + .probe = wm0010_probe, .dapm_widgets = wm0010_dapm_widgets, .num_dapm_widgets = ARRAY_SIZE(wm0010_dapm_widgets), .dapm_routes = wm0010_dapm_routes, @@ -864,15 +873,6 @@ static irqreturn_t wm0010_irq(int irq, void *data) return IRQ_NONE; }
-static int wm0010_probe(struct snd_soc_codec *codec) -{ - struct wm0010_priv *wm0010 = snd_soc_codec_get_drvdata(codec); - - wm0010->codec = codec; - - return 0; -} - static int wm0010_spi_probe(struct spi_device *spi) { unsigned long gpio_flags;