From mboxrd@z Thu Jan 1 00:00:00 1970 From: Kuninori Morimoto Subject: [PATCH 104/127] ASoC: use component probe/remove on rt5659 Date: Tue, 9 Aug 2016 05:37:15 +0000 Message-ID: <87lh068q8c.wl%kuninori.morimoto.gx@renesas.com> References: <87popieek9.wl%kuninori.morimoto.gx@renesas.com> Mime-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from relmlie4.idc.renesas.com (relmlor1.renesas.com [210.160.252.171]) by alsa0.perex.cz (Postfix) with ESMTP id 46E6F266E08 for ; Tue, 9 Aug 2016 07:37:22 +0200 (CEST) In-Reply-To: <87popieek9.wl%kuninori.morimoto.gx@renesas.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org To: Mark Brown Cc: Linux-ALSA , Simon , Liam Girdwood List-Id: alsa-devel@alsa-project.org From: Kuninori Morimoto 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 --- sound/soc/codecs/rt5659.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sound/soc/codecs/rt5659.c b/sound/soc/codecs/rt5659.c index 59ddaf3..47e0758 100644 --- a/sound/soc/codecs/rt5659.c +++ b/sound/soc/codecs/rt5659.c @@ -3600,8 +3600,9 @@ static int rt5659_set_bias_level(struct snd_soc_codec *codec, return 0; } -static int rt5659_probe(struct snd_soc_codec *codec) +static int rt5659_probe(struct snd_soc_component *component) { + struct snd_soc_codec *codec = snd_soc_component_to_codec(component); struct rt5659_priv *rt5659 = snd_soc_codec_get_drvdata(codec); rt5659->codec = codec; @@ -3609,13 +3610,12 @@ static int rt5659_probe(struct snd_soc_codec *codec) return 0; } -static int rt5659_remove(struct snd_soc_codec *codec) +static void rt5659_remove(struct snd_soc_component *component) { + struct snd_soc_codec *codec = snd_soc_component_to_codec(component); struct rt5659_priv *rt5659 = snd_soc_codec_get_drvdata(codec); regmap_write(rt5659->regmap, RT5659_RESET, 0); - - return 0; } #ifdef CONFIG_PM @@ -3716,13 +3716,13 @@ static struct snd_soc_dai_driver rt5659_dai[] = { }; static struct snd_soc_codec_driver soc_codec_dev_rt5659 = { - .probe = rt5659_probe, - .remove = rt5659_remove, .suspend = rt5659_suspend, .resume = rt5659_resume, .set_bias_level = rt5659_set_bias_level, .idle_bias_off = true, .component_driver = { + .probe = rt5659_probe, + .remove = rt5659_remove, .controls = rt5659_snd_controls, .num_controls = ARRAY_SIZE(rt5659_snd_controls), .dapm_widgets = rt5659_dapm_widgets, -- 1.9.1