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 14/16] ASoC: tegra: use devm_snd_soc_register_component()
Date: Fri, 7 Sep 2018 01:03:40 +0000	[thread overview]
Message-ID: <878t4erupk.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/tegra/tegra20_ac97.c  | 7 ++-----
 sound/soc/tegra/tegra20_i2s.c   | 7 ++-----
 sound/soc/tegra/tegra20_spdif.c | 7 ++-----
 sound/soc/tegra/tegra30_i2s.c   | 7 ++-----
 4 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/sound/soc/tegra/tegra20_ac97.c b/sound/soc/tegra/tegra20_ac97.c
index 682ef33a..a1d4d0b 100644
--- a/sound/soc/tegra/tegra20_ac97.c
+++ b/sound/soc/tegra/tegra20_ac97.c
@@ -386,7 +386,7 @@ static int tegra20_ac97_platform_probe(struct platform_device *pdev)
 		goto err_clk_disable_unprepare;
 	}
 
-	ret = snd_soc_register_component(&pdev->dev, &tegra20_ac97_component,
+	ret = devm_snd_soc_register_component(&pdev->dev, &tegra20_ac97_component,
 					 &tegra20_ac97_dai, 1);
 	if (ret) {
 		dev_err(&pdev->dev, "Could not register DAI: %d\n", ret);
@@ -397,7 +397,7 @@ static int tegra20_ac97_platform_probe(struct platform_device *pdev)
 	ret = tegra_pcm_platform_register(&pdev->dev);
 	if (ret) {
 		dev_err(&pdev->dev, "Could not register PCM: %d\n", ret);
-		goto err_unregister_component;
+		goto err_clk_disable_unprepare;
 	}
 
 	/* XXX: crufty ASoC AC97 API - only one AC97 codec allowed */
@@ -405,8 +405,6 @@ static int tegra20_ac97_platform_probe(struct platform_device *pdev)
 
 	return 0;
 
-err_unregister_component:
-	snd_soc_unregister_component(&pdev->dev);
 err_clk_disable_unprepare:
 	clk_disable_unprepare(ac97->clk_ac97);
 err_clk_put:
@@ -420,7 +418,6 @@ static int tegra20_ac97_platform_remove(struct platform_device *pdev)
 	struct tegra20_ac97 *ac97 = dev_get_drvdata(&pdev->dev);
 
 	tegra_pcm_platform_unregister(&pdev->dev);
-	snd_soc_unregister_component(&pdev->dev);
 
 	clk_disable_unprepare(ac97->clk_ac97);
 
diff --git a/sound/soc/tegra/tegra20_i2s.c b/sound/soc/tegra/tegra20_i2s.c
index 26253c2..8bbb750 100644
--- a/sound/soc/tegra/tegra20_i2s.c
+++ b/sound/soc/tegra/tegra20_i2s.c
@@ -390,7 +390,7 @@ static int tegra20_i2s_platform_probe(struct platform_device *pdev)
 			goto err_pm_disable;
 	}
 
-	ret = snd_soc_register_component(&pdev->dev, &tegra20_i2s_component,
+	ret = devm_snd_soc_register_component(&pdev->dev, &tegra20_i2s_component,
 					 &i2s->dai, 1);
 	if (ret) {
 		dev_err(&pdev->dev, "Could not register DAI: %d\n", ret);
@@ -401,13 +401,11 @@ static int tegra20_i2s_platform_probe(struct platform_device *pdev)
 	ret = tegra_pcm_platform_register(&pdev->dev);
 	if (ret) {
 		dev_err(&pdev->dev, "Could not register PCM: %d\n", ret);
-		goto err_unregister_component;
+		goto err_suspend;
 	}
 
 	return 0;
 
-err_unregister_component:
-	snd_soc_unregister_component(&pdev->dev);
 err_suspend:
 	if (!pm_runtime_status_suspended(&pdev->dev))
 		tegra20_i2s_runtime_suspend(&pdev->dev);
@@ -428,7 +426,6 @@ static int tegra20_i2s_platform_remove(struct platform_device *pdev)
 		tegra20_i2s_runtime_suspend(&pdev->dev);
 
 	tegra_pcm_platform_unregister(&pdev->dev);
-	snd_soc_unregister_component(&pdev->dev);
 
 	clk_put(i2s->clk_i2s);
 
diff --git a/sound/soc/tegra/tegra20_spdif.c b/sound/soc/tegra/tegra20_spdif.c
index 767c049..66f5549 100644
--- a/sound/soc/tegra/tegra20_spdif.c
+++ b/sound/soc/tegra/tegra20_spdif.c
@@ -314,7 +314,7 @@ static int tegra20_spdif_platform_probe(struct platform_device *pdev)
 			goto err_pm_disable;
 	}
 
-	ret = snd_soc_register_component(&pdev->dev, &tegra20_spdif_component,
+	ret = devm_snd_soc_register_component(&pdev->dev, &tegra20_spdif_component,
 					 &tegra20_spdif_dai, 1);
 	if (ret) {
 		dev_err(&pdev->dev, "Could not register DAI: %d\n", ret);
@@ -325,13 +325,11 @@ static int tegra20_spdif_platform_probe(struct platform_device *pdev)
 	ret = tegra_pcm_platform_register(&pdev->dev);
 	if (ret) {
 		dev_err(&pdev->dev, "Could not register PCM: %d\n", ret);
-		goto err_unregister_component;
+		goto err_suspend;
 	}
 
 	return 0;
 
-err_unregister_component:
-	snd_soc_unregister_component(&pdev->dev);
 err_suspend:
 	if (!pm_runtime_status_suspended(&pdev->dev))
 		tegra20_spdif_runtime_suspend(&pdev->dev);
@@ -348,7 +346,6 @@ static int tegra20_spdif_platform_remove(struct platform_device *pdev)
 		tegra20_spdif_runtime_suspend(&pdev->dev);
 
 	tegra_pcm_platform_unregister(&pdev->dev);
-	snd_soc_unregister_component(&pdev->dev);
 
 	return 0;
 }
diff --git a/sound/soc/tegra/tegra30_i2s.c b/sound/soc/tegra/tegra30_i2s.c
index 0b176ea..0b9dfab 100644
--- a/sound/soc/tegra/tegra30_i2s.c
+++ b/sound/soc/tegra/tegra30_i2s.c
@@ -474,7 +474,7 @@ static int tegra30_i2s_platform_probe(struct platform_device *pdev)
 		goto err_free_rx_fifo;
 	}
 
-	ret = snd_soc_register_component(&pdev->dev, &tegra30_i2s_component,
+	ret = devm_snd_soc_register_component(&pdev->dev, &tegra30_i2s_component,
 				   &i2s->dai, 1);
 	if (ret) {
 		dev_err(&pdev->dev, "Could not register DAI: %d\n", ret);
@@ -487,13 +487,11 @@ static int tegra30_i2s_platform_probe(struct platform_device *pdev)
 				i2s->capture_dma_chan);
 	if (ret) {
 		dev_err(&pdev->dev, "Could not register PCM: %d\n", ret);
-		goto err_unregister_component;
+		goto err_unroute_rx_fifo;
 	}
 
 	return 0;
 
-err_unregister_component:
-	snd_soc_unregister_component(&pdev->dev);
 err_unroute_rx_fifo:
 	tegra30_ahub_unset_rx_cif_source(i2s->capture_fifo_cif);
 err_free_rx_fifo:
@@ -522,7 +520,6 @@ static int tegra30_i2s_platform_remove(struct platform_device *pdev)
 		tegra30_i2s_runtime_suspend(&pdev->dev);
 
 	tegra_pcm_platform_unregister(&pdev->dev);
-	snd_soc_unregister_component(&pdev->dev);
 
 	tegra30_ahub_unset_rx_cif_source(i2s->capture_fifo_cif);
 	tegra30_ahub_free_rx_fifo(i2s->capture_fifo_cif);
-- 
2.7.4

  parent reply	other threads:[~2018-09-07  1:03 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 ` [PATCH 04/16] ASoC: cirrus: use devm_snd_soc_register_component() Kuninori Morimoto
2018-09-10 14:06   ` 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 ` Kuninori Morimoto [this message]
2018-09-07  1:03 ` [PATCH 15/16] ASoC: txx9: use devm_snd_soc_register_component() 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=878t4erupk.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.