From: Dmitry Osipenko <digetx@gmail.com>
To: Thierry Reding <thierry.reding@gmail.com>,
Jonathan Hunter <jonathanh@nvidia.com>,
Mark Brown <broonie@kernel.org>, Takashi Iwai <tiwai@suse.com>,
Jaroslav Kysela <perex@perex.cz>,
Philipp Zabel <p.zabel@pengutronix.de>,
Paul Fertser <fercerpav@gmail.com>
Cc: alsa-devel@alsa-project.org, devicetree@vger.kernel.org,
linux-tegra@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH v5 10/17] ASoC: tegra20: i2s: Use devm_clk_get()
Date: Sun, 14 Mar 2021 18:44:52 +0300 [thread overview]
Message-ID: <20210314154459.15375-11-digetx@gmail.com> (raw)
In-Reply-To: <20210314154459.15375-1-digetx@gmail.com>
Use resource-managed variant of clk_get() to simplify code.
Signed-off-by: Dmitry Osipenko <digetx@gmail.com>
---
sound/soc/tegra/tegra20_i2s.c | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/sound/soc/tegra/tegra20_i2s.c b/sound/soc/tegra/tegra20_i2s.c
index 0f2bdc2e8598..fe569198b17a 100644
--- a/sound/soc/tegra/tegra20_i2s.c
+++ b/sound/soc/tegra/tegra20_i2s.c
@@ -370,7 +370,7 @@ static int tegra20_i2s_platform_probe(struct platform_device *pdev)
return PTR_ERR(i2s->reset);
}
- i2s->clk_i2s = clk_get(&pdev->dev, NULL);
+ i2s->clk_i2s = devm_clk_get(&pdev->dev, NULL);
if (IS_ERR(i2s->clk_i2s)) {
dev_err(&pdev->dev, "Can't retrieve i2s clock\n");
ret = PTR_ERR(i2s->clk_i2s);
@@ -381,7 +381,7 @@ static int tegra20_i2s_platform_probe(struct platform_device *pdev)
regs = devm_ioremap_resource(&pdev->dev, mem);
if (IS_ERR(regs)) {
ret = PTR_ERR(regs);
- goto err_clk_put;
+ goto err;
}
i2s->regmap = devm_regmap_init_mmio(&pdev->dev, regs,
@@ -389,7 +389,7 @@ static int tegra20_i2s_platform_probe(struct platform_device *pdev)
if (IS_ERR(i2s->regmap)) {
dev_err(&pdev->dev, "regmap init failed\n");
ret = PTR_ERR(i2s->regmap);
- goto err_clk_put;
+ goto err;
}
i2s->capture_dma_data.addr = mem->start + TEGRA20_I2S_FIFO2;
@@ -430,16 +430,12 @@ static int tegra20_i2s_platform_probe(struct platform_device *pdev)
tegra20_i2s_runtime_suspend(&pdev->dev);
err_pm_disable:
pm_runtime_disable(&pdev->dev);
-err_clk_put:
- clk_put(i2s->clk_i2s);
err:
return ret;
}
static int tegra20_i2s_platform_remove(struct platform_device *pdev)
{
- struct tegra20_i2s *i2s = dev_get_drvdata(&pdev->dev);
-
tegra_pcm_platform_unregister(&pdev->dev);
snd_soc_unregister_component(&pdev->dev);
@@ -447,8 +443,6 @@ static int tegra20_i2s_platform_remove(struct platform_device *pdev)
if (!pm_runtime_status_suspended(&pdev->dev))
tegra20_i2s_runtime_suspend(&pdev->dev);
- clk_put(i2s->clk_i2s);
-
return 0;
}
--
2.30.2
next prev parent reply other threads:[~2021-03-14 15:46 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-14 15:44 [PATCH v5 00/17] Fix reset controls and RPM of NVIDIA Tegra ASoC drivers Dmitry Osipenko
2021-03-14 15:44 ` [PATCH v5 01/17] ASoC: tegra20: ac97: Add reset control Dmitry Osipenko
2021-03-14 15:44 ` [PATCH v5 02/17] ASoC: tegra20: i2s: " Dmitry Osipenko
2021-03-14 15:44 ` [PATCH v5 03/17] ASoC: tegra30: i2s: Restore hardware state on runtime PM resume Dmitry Osipenko
2021-03-14 15:44 ` [PATCH v5 04/17] reset: Add reset_control_bulk API Dmitry Osipenko
2021-03-14 15:44 ` [PATCH v5 05/17] ASoC: tegra30: ahub: Switch to use reset-bulk API Dmitry Osipenko
2021-03-14 15:44 ` [PATCH v5 06/17] ASoC: tegra20: spdif: Correct driver removal order Dmitry Osipenko
2021-03-14 15:44 ` [PATCH v5 07/17] ASoC: tegra20: spdif: Remove handing of disabled runtime PM Dmitry Osipenko
2021-03-14 15:44 ` [PATCH v5 08/17] ASoC: tegra20: i2s: Add system level suspend-resume callbacks Dmitry Osipenko
2021-03-14 15:44 ` [PATCH v5 09/17] ASoC: tegra20: i2s: Correct driver removal order Dmitry Osipenko
2021-03-14 15:44 ` Dmitry Osipenko [this message]
2021-03-14 15:44 ` [PATCH v5 11/17] ASoC: tegra20: i2s: Remove handing of disabled runtime PM Dmitry Osipenko
2021-03-14 15:44 ` [PATCH v5 12/17] ASoC: tegra30: i2s: Correct driver removal order Dmitry Osipenko
2021-03-14 15:44 ` [PATCH v5 13/17] ASoC: tegra30: i2s: Use devm_clk_get() Dmitry Osipenko
2021-03-14 15:44 ` [PATCH v5 14/17] ASoC: tegra30: i2s: Remove handing of disabled runtime PM Dmitry Osipenko
2021-03-14 15:44 ` [PATCH v5 15/17] ASoC: tegra30: ahub: Reset global variable Dmitry Osipenko
2021-03-14 15:44 ` [PATCH v5 16/17] ASoC: tegra30: ahub: Correct suspend-resume callbacks Dmitry Osipenko
2021-03-14 15:44 ` [PATCH v5 17/17] ASoC: tegra30: ahub: Remove handing of disabled runtime PM Dmitry Osipenko
2021-03-17 17:20 ` [PATCH v5 00/17] Fix reset controls and RPM of NVIDIA Tegra ASoC drivers Dmitry Osipenko
2021-03-17 17:54 ` Mark Brown
2021-03-17 18:12 ` Dmitry Osipenko
2021-03-18 18:33 ` Mark Brown
2021-03-18 18:36 ` Mark Brown
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=20210314154459.15375-11-digetx@gmail.com \
--to=digetx@gmail.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=fercerpav@gmail.com \
--cc=jonathanh@nvidia.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tegra@vger.kernel.org \
--cc=p.zabel@pengutronix.de \
--cc=perex@perex.cz \
--cc=thierry.reding@gmail.com \
--cc=tiwai@suse.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).