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 04/16] ASoC: cirrus: use devm_snd_soc_register_component()
Date: Fri, 7 Sep 2018 01:01:05 +0000	[thread overview]
Message-ID: <87musurutv.wl-kuninori.morimoto.gx@renesas.com> (raw)
In-Reply-To: <87sh2mruw6.wl-kuninori.morimoto.gx@renesas.com>


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

Now we have devm_snd_soc_register_component().
Let's use it instead of snd_soc_register_component().

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
 sound/soc/cirrus/ep93xx-ac97.c | 8 ++------
 sound/soc/cirrus/ep93xx-i2s.c  | 7 ++-----
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/sound/soc/cirrus/ep93xx-ac97.c b/sound/soc/cirrus/ep93xx-ac97.c
index cd5a939..ecbe3c2 100644
--- a/sound/soc/cirrus/ep93xx-ac97.c
+++ b/sound/soc/cirrus/ep93xx-ac97.c
@@ -399,19 +399,17 @@ static int ep93xx_ac97_probe(struct platform_device *pdev)
 	if (ret)
 		goto fail;
 
-	ret = snd_soc_register_component(&pdev->dev, &ep93xx_ac97_component,
+	ret = devm_snd_soc_register_component(&pdev->dev, &ep93xx_ac97_component,
 					 &ep93xx_ac97_dai, 1);
 	if (ret)
 		goto fail;
 
 	ret = devm_ep93xx_pcm_platform_register(&pdev->dev);
 	if (ret)
-		goto fail_unregister;
+		goto fail;
 
 	return 0;
 
-fail_unregister:
-	snd_soc_unregister_component(&pdev->dev);
 fail:
 	ep93xx_ac97_info = NULL;
 	snd_soc_set_ac97_ops(NULL);
@@ -422,8 +420,6 @@ static int ep93xx_ac97_remove(struct platform_device *pdev)
 {
 	struct ep93xx_ac97_info	*info = platform_get_drvdata(pdev);
 
-	snd_soc_unregister_component(&pdev->dev);
-
 	/* disable the AC97 controller */
 	ep93xx_ac97_write_reg(info, AC97GCR, 0);
 
diff --git a/sound/soc/cirrus/ep93xx-i2s.c b/sound/soc/cirrus/ep93xx-i2s.c
index 0918c5d..f5c3407 100644
--- a/sound/soc/cirrus/ep93xx-i2s.c
+++ b/sound/soc/cirrus/ep93xx-i2s.c
@@ -478,19 +478,17 @@ static int ep93xx_i2s_probe(struct platform_device *pdev)
 
 	dev_set_drvdata(&pdev->dev, info);
 
-	err = snd_soc_register_component(&pdev->dev, &ep93xx_i2s_component,
+	err = devm_snd_soc_register_component(&pdev->dev, &ep93xx_i2s_component,
 					 &ep93xx_i2s_dai, 1);
 	if (err)
 		goto fail_put_lrclk;
 
 	err = devm_ep93xx_pcm_platform_register(&pdev->dev);
 	if (err)
-		goto fail_unregister;
+		goto fail_put_lrclk;
 
 	return 0;
 
-fail_unregister:
-	snd_soc_unregister_component(&pdev->dev);
 fail_put_lrclk:
 	clk_put(info->lrclk);
 fail_put_sclk:
@@ -505,7 +503,6 @@ static int ep93xx_i2s_remove(struct platform_device *pdev)
 {
 	struct ep93xx_i2s_info *info = dev_get_drvdata(&pdev->dev);
 
-	snd_soc_unregister_component(&pdev->dev);
 	clk_put(info->lrclk);
 	clk_put(info->sclk);
 	clk_put(info->mclk);
-- 
2.7.4

  parent reply	other threads:[~2018-09-07  1:01 UTC|newest]

Thread overview: 31+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-09-07  0:59 [PATCH 00/16] ASoC: use devm_snd_soc_register_component() Kuninori Morimoto
2018-09-07  1:00 ` [PATCH 01/16] ASoC: atmel_ssc_dai: " Kuninori Morimoto
2018-09-10 14:22   ` Applied "ASoC: atmel_ssc_dai: use devm_snd_soc_register_component()" to the asoc tree Mark Brown
2018-09-07  1:00 ` [PATCH 02/16] ASoC: au1x: ac97c: use devm_snd_soc_register_component() Kuninori Morimoto
2018-09-10 13:59   ` Mark Brown
2018-09-07  1:00 ` [PATCH 03/16] ASoC: bcm: " Kuninori Morimoto
2018-09-10 14:22   ` Applied "ASoC: bcm: use devm_snd_soc_register_component()" to the asoc tree Mark Brown
2018-09-07  1:01 ` Kuninori Morimoto [this message]
2018-09-10 14:06   ` [PATCH 04/16] ASoC: cirrus: use devm_snd_soc_register_component() Mark Brown
2018-09-11  0:08     ` Kuninori Morimoto
2018-09-07  1:01 ` [PATCH 05/16] ASoC: hdac_hda: " Kuninori Morimoto
2018-09-10 14:22   ` Applied "ASoC: hdac_hda: use devm_snd_soc_register_component()" to the asoc tree Mark Brown
2018-09-07  1:01 ` [PATCH 06/16] ASoC: rt5668: use devm_snd_soc_register_component() Kuninori Morimoto
2018-09-10 14:08   ` Mark Brown
2018-09-11  0:09     ` Kuninori Morimoto
2018-09-10 14:22   ` Applied "ASoC: rt5668: use devm_snd_soc_register_component()" to the asoc tree Mark Brown
2018-09-07  1:01 ` [PATCH 07/16] ASoC: tscs454: use devm_snd_soc_register_component() Kuninori Morimoto
2018-09-10 14:21   ` Applied "ASoC: tscs454: use devm_snd_soc_register_component()" to the asoc tree Mark Brown
2018-09-07  1:02 ` [PATCH 08/16] ASoC: davinci: use devm_snd_soc_register_component() Kuninori Morimoto
2018-09-07  1:02 ` [PATCH 09/16] ASoC: fsl: " Kuninori Morimoto
2018-09-07  1:02 ` [PATCH 10/16] ASoC: nuc900: " Kuninori Morimoto
2018-09-10 14:21   ` Applied "ASoC: nuc900: use devm_snd_soc_register_component()" to the asoc tree Mark Brown
2018-09-07  1:02 ` [PATCH 11/16] ASoC: omap: use devm_snd_soc_register_component() Kuninori Morimoto
2018-09-10 14:21   ` Applied "ASoC: omap: use devm_snd_soc_register_component()" to the asoc tree Mark Brown
2018-09-07  1:03 ` [PATCH 12/16] ASoC: pxa: use devm_snd_soc_register_component() Kuninori Morimoto
2018-09-07  1:03 ` [PATCH 13/16] ASoC: sh: " Kuninori Morimoto
2018-09-10 14:21   ` Applied "ASoC: sh: use devm_snd_soc_register_component()" to the asoc tree Mark Brown
2018-09-07  1:03 ` [PATCH 14/16] ASoC: tegra: use devm_snd_soc_register_component() Kuninori Morimoto
2018-09-07  1:03 ` [PATCH 15/16] ASoC: txx9: " Kuninori Morimoto
2018-09-10 14:21   ` Applied "ASoC: txx9: use devm_snd_soc_register_component()" to the asoc tree Mark Brown
2018-09-07  1:04 ` [PATCH 16/16] ASoC: ux500: use devm_snd_soc_register_component() 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=87musurutv.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.