From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
To: Mark Brown <broonie@kernel.org>
Cc: Linux-ALSA <alsa-devel@alsa-project.org>
Subject: [PATCH v2 20/23] ASoC: tegra: tegra20_ac97.c: use devm_snd_soc_register_component()
Date: 28 Jun 2019 13:11:04 +0900 [thread overview]
Message-ID: <87imsqs662.wl-kuninori.morimoto.gx@renesas.com> (raw)
In-Reply-To: <87blyitky2.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>
---
v1 -> v2
- no change
sound/soc/tegra/tegra20_ac97.c | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/sound/soc/tegra/tegra20_ac97.c b/sound/soc/tegra/tegra20_ac97.c
index 7c359c4..ae94db4 100644
--- a/sound/soc/tegra/tegra20_ac97.c
+++ b/sound/soc/tegra/tegra20_ac97.c
@@ -377,8 +377,8 @@ 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,
- &tegra20_ac97_dai, 1);
+ 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);
ret = -ENOMEM;
@@ -388,7 +388,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 */
@@ -396,8 +396,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:
@@ -410,8 +408,6 @@ static int tegra20_ac97_platform_remove(struct platform_device *pdev)
{
struct tegra20_ac97 *ac97 = dev_get_drvdata(&pdev->dev);
- snd_soc_unregister_component(&pdev->dev);
-
clk_disable_unprepare(ac97->clk_ac97);
snd_soc_set_ac97_ops(NULL);
--
2.7.4
next prev parent reply other threads:[~2019-06-28 4:11 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-28 4:06 [PATCH v2 00/23] ASoC: use devm_xxx Kuninori Morimoto
2019-06-28 4:07 ` [PATCH v2 01/23] ASoC: atmel: atmel-pcm-dma.c: use devm_snd_dmaengine_pcm_register() Kuninori Morimoto
2019-06-28 9:45 ` Codrin.Ciubotariu
2019-06-28 16:56 ` Applied "ASoC: atmel: atmel-pcm-dma.c: use devm_snd_dmaengine_pcm_register()" to the asoc tree Mark Brown
2019-06-28 4:07 ` [PATCH v2 02/23] ASoC: sunxi: sun4i-i2s.c: use devm_snd_dmaengine_pcm_register() Kuninori Morimoto
2019-06-28 4:07 ` [PATCH v2 03/23] ASoC: tegra: tegra_pcm.c: " Kuninori Morimoto
2019-06-28 4:08 ` [PATCH v2 04/23] ASoC: ux500: ux500_pcm.c: " Kuninori Morimoto
2019-06-28 4:08 ` [PATCH v2 05/23] ASoC: au1x: i2sc.c: use devm_snd_soc_register_component() Kuninori Morimoto
2019-06-28 4:08 ` [PATCH v2 06/23] ASoC: au1x: ac97c.c: " Kuninori Morimoto
2019-06-28 4:08 ` [PATCH v2 07/23] ASoC: au1x: psc-ac97.c: " Kuninori Morimoto
2019-07-02 12:39 ` Mark Brown
2019-07-03 0:36 ` Kuninori Morimoto
2019-06-28 4:08 ` [PATCH v2 08/23] ASoC: au1x: psc-i2s.c: " Kuninori Morimoto
2019-07-02 13:04 ` Applied "ASoC: au1x: psc-i2s.c: use devm_snd_soc_register_component()" to the asoc tree Mark Brown
2019-06-28 4:09 ` [PATCH v2 09/23] ASoC: cirrus: ep93xx-i2s.c: use devm_snd_soc_register_component() Kuninori Morimoto
2019-07-02 12:44 ` Mark Brown
2019-06-28 4:09 ` [PATCH v2 10/23] ASoC: cirrus: ep93xx-ac97.c: " Kuninori Morimoto
2019-06-28 4:09 ` [PATCH v2 11/23] ASoC: rt5682: " Kuninori Morimoto
2019-07-02 13:04 ` Applied "ASoC: rt5682: use devm_snd_soc_register_component()" to the asoc tree Mark Brown
2019-06-28 4:09 ` [PATCH v2 12/23] ASoC: ak4118: use devm_snd_soc_register_component() Kuninori Morimoto
2019-07-02 13:04 ` Applied "ASoC: ak4118: use devm_snd_soc_register_component()" to the asoc tree Mark Brown
2019-06-28 4:09 ` [PATCH v2 13/23] ASoC: cros_ec_codec: use devm_snd_soc_register_component() Kuninori Morimoto
2019-07-02 13:04 ` Applied "ASoC: cros_ec_codec: use devm_snd_soc_register_component()" to the asoc tree Mark Brown
2019-06-28 4:10 ` [PATCH v2 14/23] ASoC: fsl: imx-ssi.c: use devm_snd_soc_register_component() Kuninori Morimoto
2019-06-28 4:10 ` [PATCH v2 15/23] ASoC: fsl: mpc5200_psc_i2s.c: " Kuninori Morimoto
2019-06-28 4:10 ` [PATCH v2 16/23] ASoC: fsl: mpc5200_psc_ac97.c: " Kuninori Morimoto
2019-06-28 4:10 ` [PATCH v2 17/23] ASoC: pxa: pxa2xx-ac97.c: " Kuninori Morimoto
2019-07-02 13:04 ` Applied "ASoC: pxa: pxa2xx-ac97.c: use devm_snd_soc_register_component()" to the asoc tree Mark Brown
2019-06-28 4:10 ` [PATCH v2 18/23] ASoC: tegra: tegra20_i2s.c: use devm_snd_soc_register_component() Kuninori Morimoto
2019-07-02 12:45 ` Mark Brown
2019-06-28 4:10 ` [PATCH v2 19/23] ASoC: tegra: tegra20_spdif.c: " Kuninori Morimoto
2019-06-28 4:11 ` Kuninori Morimoto [this message]
2019-06-28 4:11 ` [PATCH v2 21/23] ASoC: tegra: tegra30_i2s.c: " Kuninori Morimoto
2019-06-28 4:11 ` [PATCH v2 22/23] ASoC: ti: davinci-i2s.c: " Kuninori Morimoto
2019-06-28 4:11 ` [PATCH v2 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=87imsqs662.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.