| Message ID | 8dab942d6ce47657a9c038295959be80bb2ee09e.1679834598.git.christophe.jaillet@wanadoo.fr |
|---|---|
| State | Accepted |
| Commit | 65d4d7259bfec376b6b1483b4fe4058a5ba2259b |
| Headers | show |
| Series | ASoC: meson: Use the devm_clk_get_optional() helper | expand |
On Sun 26 Mar 2023 at 14:43, Christophe JAILLET <christophe.jaillet@wanadoo.fr> wrote: > 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> Thx. Reviewed-by: Jerome Brunet <jbrunet@baylibre.com> > --- > sound/soc/meson/axg-tdm-interface.c | 13 ++++--------- > 1 file 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,
On Sun, 26 Mar 2023 14:43:38 +0200, Christophe JAILLET wrote: > Use devm_clk_get_optional() instead of hand writing it. > This saves some loC and improves the semantic. > > Applied to broonie/sound.git for-next Thanks! [1/1] ASoC: meson: Use the devm_clk_get_optional() helper commit: 65d4d7259bfec376b6b1483b4fe4058a5ba2259b All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark
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,
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> --- sound/soc/meson/axg-tdm-interface.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-)