From mboxrd@z Thu Jan 1 00:00:00 1970 From: Kuninori Morimoto Subject: [PATCH 126/127] ASoC: use component probe/remove on da7218 Date: Tue, 9 Aug 2016 05:45:39 +0000 Message-ID: <87popi7b9x.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 relmlie1.idc.renesas.com (relmlor2.renesas.com [210.160.252.172]) by alsa0.perex.cz (Postfix) with ESMTP id 7CFFF26769E for ; Tue, 9 Aug 2016 07:45:44 +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/da7218.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sound/soc/codecs/da7218.c b/sound/soc/codecs/da7218.c index dcdda6c..bbaae56 100644 --- a/sound/soc/codecs/da7218.c +++ b/sound/soc/codecs/da7218.c @@ -2885,8 +2885,9 @@ static void da7218_handle_pdata(struct snd_soc_codec *codec) } } -static int da7218_probe(struct snd_soc_codec *codec) +static int da7218_probe(struct snd_soc_component *component) { + struct snd_soc_codec *codec = snd_soc_component_to_codec(component); struct da7218_priv *da7218 = snd_soc_codec_get_drvdata(codec); int ret; @@ -2997,13 +2998,12 @@ err_disable_reg: return ret; } -static int da7218_remove(struct snd_soc_codec *codec) +static void da7218_remove(struct snd_soc_component *component) { + struct snd_soc_codec *codec = snd_soc_component_to_codec(component); struct da7218_priv *da7218 = snd_soc_codec_get_drvdata(codec); regulator_bulk_disable(DA7218_NUM_SUPPLIES, da7218->supplies); - - return 0; } #ifdef CONFIG_PM @@ -3039,13 +3039,13 @@ static int da7218_resume(struct snd_soc_codec *codec) #endif static struct snd_soc_codec_driver soc_codec_dev_da7218 = { - .probe = da7218_probe, - .remove = da7218_remove, .suspend = da7218_suspend, .resume = da7218_resume, .set_bias_level = da7218_set_bias_level, .component_driver = { + .probe = da7218_probe, + .remove = da7218_remove, .controls = da7218_snd_controls, .num_controls = ARRAY_SIZE(da7218_snd_controls), .dapm_widgets = da7218_dapm_widgets, -- 1.9.1