All of lore.kernel.org
 help / color / mirror / Atom feed
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
To: Mark Brown <broonie@kernel.org>
Cc: Linux-ALSA <alsa-devel@alsa-project.org>
Subject: [PATCH 22/23] ASoC: ti: davinci-i2s.c: use devm_snd_soc_register_component()
Date: 27 Jun 2019 11:01:40 +0900	[thread overview]
Message-ID: <877e97iya4.wl-kuninori.morimoto.gx@renesas.com> (raw)
In-Reply-To: <8736jvkcy1.wl-kuninori.morimoto.gx@renesas.com>

From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>

We have devm_xxx version of snd_soc_register_component,
let's use it.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
 sound/soc/ti/davinci-i2s.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/sound/soc/ti/davinci-i2s.c b/sound/soc/ti/davinci-i2s.c
index 92c1bdc..67b8538 100644
--- a/sound/soc/ti/davinci-i2s.c
+++ b/sound/soc/ti/davinci-i2s.c
@@ -723,7 +723,7 @@ static int davinci_i2s_probe(struct platform_device *pdev)
 	dev->dev = &pdev->dev;
 	dev_set_drvdata(&pdev->dev, dev);
 
-	ret = snd_soc_register_component(&pdev->dev, &davinci_i2s_component,
+	ret = devm_snd_soc_register_component(&pdev->dev, &davinci_i2s_component,
 					 &davinci_i2s_dai, 1);
 	if (ret != 0)
 		goto err_release_clk;
@@ -731,13 +731,11 @@ static int davinci_i2s_probe(struct platform_device *pdev)
 	ret = edma_pcm_platform_register(&pdev->dev);
 	if (ret) {
 		dev_err(&pdev->dev, "register PCM failed: %d\n", ret);
-		goto err_unregister_component;
+		goto err_release_clk;
 	}
 
 	return 0;
 
-err_unregister_component:
-	snd_soc_unregister_component(&pdev->dev);
 err_release_clk:
 	clk_disable(dev->clk);
 	clk_put(dev->clk);
@@ -748,8 +746,6 @@ static int davinci_i2s_remove(struct platform_device *pdev)
 {
 	struct davinci_mcbsp_dev *dev = dev_get_drvdata(&pdev->dev);
 
-	snd_soc_unregister_component(&pdev->dev);
-
 	clk_disable(dev->clk);
 	clk_put(dev->clk);
 	dev->clk = NULL;
-- 
2.7.4

  parent reply	other threads:[~2019-06-27  2:01 UTC|newest]

Thread overview: 34+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-06-27  1:59 [PATCH 00/23] ASoC: use devm_xxx Kuninori Morimoto
2019-06-27  2:00 ` [PATCH 01/23] ASoC: atmel: atmel-pcm:dma.c: use devm_snd_dmaengine_pcm_register() Kuninori Morimoto
2019-06-27  7:43   ` Amadeusz Sławiński
2019-06-27  8:20     ` Codrin.Ciubotariu
2019-06-27  8:24       ` Kuninori Morimoto
2019-06-27 11:38         ` Mark Brown
2019-06-28  1:53           ` Kuninori Morimoto
2019-06-27  2:00 ` [PATCH 02/23] ASoC: sunxi: sun4i-i2s.c: " Kuninori Morimoto
2019-06-27  2:00 ` [PATCH 03/23] ASoC: tegra: tegra_pcm.c: " Kuninori Morimoto
2019-06-27  7:43   ` Amadeusz Sławiński
2019-06-27  2:00 ` [PATCH 04/23] ASoC: ux500: ux500_pcm.c: " Kuninori Morimoto
2019-06-27  7:43   ` Amadeusz Sławiński
2019-06-27  2:00 ` [PATCH 05/23] ASoC: au1x: i2sc.c: use devm_snd_soc_register_component() Kuninori Morimoto
2019-06-27  2:00 ` [PATCH 06/23] ASoC: au1x: ac97c.c: " Kuninori Morimoto
2019-06-27  2:00 ` [PATCH 07/23] ASoC: au1x: psc-ac97.c: " Kuninori Morimoto
2019-06-27  2:00 ` [PATCH 08/23] ASoC: au1x: psc-i2s.c: " Kuninori Morimoto
2019-06-27  2:00 ` [PATCH 09/23] ASoC: cirrus: ep93xx-i2s.c: " Kuninori Morimoto
2019-06-27  2:00 ` [PATCH 10/23] ASoC: cirrus: ep93xx-ac97.c: " Kuninori Morimoto
2019-06-27  2:00 ` [PATCH 11/23] ASoC: rt5682: " Kuninori Morimoto
2019-06-27  7:43   ` Amadeusz Sławiński
2019-06-27  2:00 ` [PATCH 12/23] ASoC: ak4118: " Kuninori Morimoto
2019-06-27  7:43   ` Amadeusz Sławiński
2019-06-27  7:51     ` Kuninori Morimoto
2019-06-27  2:00 ` [PATCH 13/23] ASoC: cros_ec_codec: " Kuninori Morimoto
2019-06-27  2:00 ` [PATCH 14/23] ASoC: fsl: imx-ssi.c: " Kuninori Morimoto
2019-06-27  2:01 ` [PATCH 15/23] ASoC: fsl: mpc5200_psc_i2s.c: " Kuninori Morimoto
2019-06-27  2:01 ` [PATCH 16/23] ASoC: fsl: mpc5200_psc_ac97.c: " Kuninori Morimoto
2019-06-27  2:01 ` [PATCH 17/23] ASoC: pxa: pxa2xx-ac97.c: " Kuninori Morimoto
2019-06-27  2:01 ` [PATCH 18/23] ASoC: tegra: tegra20_i2s.c: " Kuninori Morimoto
2019-06-27  2:01 ` [PATCH 19/23] ASoC: tegra: tegra20_spdif.c: " Kuninori Morimoto
2019-06-27  2:01 ` [PATCH 20/23] ASoC: tegra: tegra30_i2s.c: " Kuninori Morimoto
2019-06-27  2:01 ` [PATCH 21/23] ASoC: tegra: tegra20_ac97.c: " Kuninori Morimoto
2019-06-27  2:01 ` Kuninori Morimoto [this message]
2019-06-27  2:01 ` [PATCH 23/23] ASoC: ux500: ux500_msp_dai.c: " Kuninori Morimoto

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=877e97iya4.wl-kuninori.morimoto.gx@renesas.com \
    --to=kuninori.morimoto.gx@renesas.com \
    --cc=alsa-devel@alsa-project.org \
    --cc=broonie@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.