aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/sound/soc/meson
diff options
context:
space:
mode:
authorChristophe JAILLET <christophe.jaillet@wanadoo.fr>2023-03-26 14:43:38 +0200
committerMark Brown <broonie@kernel.org>2023-03-27 13:04:26 +0100
commit65d4d7259bfec376b6b1483b4fe4058a5ba2259b (patch)
treeff0e42e6e0491a97b870cd389c9d381028942323 /sound/soc/meson
parentASoC: cs35l56: Remove redundant return statement in cs35l56_spi_probe() (diff)
downloadwireguard-linux-65d4d7259bfec376b6b1483b4fe4058a5ba2259b.tar.xz
wireguard-linux-65d4d7259bfec376b6b1483b4fe4058a5ba2259b.zip
ASoC: meson: Use the devm_clk_get_optional() helper
Use devm_clk_get_optional() instead of hand writing it. This saves some loC and improves the semantic. Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> Reviewed-by: Jerome Brunet <jbrunet@baylibre.com> Link: https://lore.kernel.org/r/8dab942d6ce47657a9c038295959be80bb2ee09e.1679834598.git.christophe.jaillet@wanadoo.fr Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/meson')
-rw-r--r--sound/soc/meson/axg-tdm-interface.c13
1 files changed, 4 insertions, 9 deletions
diff --git a/sound/soc/meson/axg-tdm-interface.c b/sound/soc/meson/axg-tdm-interface.c
index 7624aafe9009..5e5e4c56d505 100644
--- a/sound/soc/meson/axg-tdm-interface.c
+++ b/sound/soc/meson/axg-tdm-interface.c
@@ -496,7 +496,7 @@ static int axg_tdm_iface_probe(struct platform_device *pdev)
struct device *dev = &pdev->dev;
struct snd_soc_dai_driver *dai_drv;
struct axg_tdm_iface *iface;
- int ret, i;
+ int i;
iface = devm_kzalloc(dev, sizeof(*iface), GFP_KERNEL);
if (!iface)
@@ -533,14 +533,9 @@ static int axg_tdm_iface_probe(struct platform_device *pdev)
* At this point, ignore the error if mclk is missing. We'll
* throw an error if the cpu dai is master and mclk is missing
*/
- iface->mclk = devm_clk_get(dev, "mclk");
- if (IS_ERR(iface->mclk)) {
- ret = PTR_ERR(iface->mclk);
- if (ret == -ENOENT)
- iface->mclk = NULL;
- else
- return dev_err_probe(dev, ret, "failed to get mclk\n");
- }
+ iface->mclk = devm_clk_get_optional(dev, "mclk");
+ if (IS_ERR(iface->mclk))
+ return dev_err_probe(dev, PTR_ERR(iface->mclk), "failed to get mclk\n");
return devm_snd_soc_register_component(dev,
&axg_tdm_iface_component_drv, dai_drv,