| Message ID | 20220601092342.3328644-1-m.felsch@pengutronix.de (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | f53f50ee21d46094a8c48970e95e38a4deaa128e |
| Headers | show |
| Series | [1/3] ASoC: fsl_sai: use local device pointer | expand |
On Wed, Jun 1, 2022 at 5:23 PM Marco Felsch <m.felsch@pengutronix.de> wrote: > Use a local variable to dereference the device pointer once and use the > local variable in further calls. No functional changes. > > Signed-off-by: Marco Felsch <m.felsch@pengutronix.de> > Acked-by: Shengjiu Wang <shengjiu.wang@gmail.com> Best regards Wang shengjiu > --- > sound/soc/fsl/fsl_sai.c | 53 +++++++++++++++++++++-------------------- > 1 file changed, 27 insertions(+), 26 deletions(-) > > diff --git a/sound/soc/fsl/fsl_sai.c b/sound/soc/fsl/fsl_sai.c > index fa950dde5310..a7637d602f3c 100644 > --- a/sound/soc/fsl/fsl_sai.c > +++ b/sound/soc/fsl/fsl_sai.c > @@ -1004,6 +1004,7 @@ static int fsl_sai_runtime_resume(struct device > *dev); > static int fsl_sai_probe(struct platform_device *pdev) > { > struct device_node *np = pdev->dev.of_node; > + struct device *dev = &pdev->dev; > struct fsl_sai *sai; > struct regmap *gpr; > struct resource *res; > @@ -1012,12 +1013,12 @@ static int fsl_sai_probe(struct platform_device > *pdev) > int irq, ret, i; > int index; > > - sai = devm_kzalloc(&pdev->dev, sizeof(*sai), GFP_KERNEL); > + sai = devm_kzalloc(dev, sizeof(*sai), GFP_KERNEL); > if (!sai) > return -ENOMEM; > > sai->pdev = pdev; > - sai->soc_data = of_device_get_match_data(&pdev->dev); > + sai->soc_data = of_device_get_match_data(dev); > > sai->is_lsb_first = of_property_read_bool(np, "lsb-first"); > > @@ -1032,18 +1033,18 @@ static int fsl_sai_probe(struct platform_device > *pdev) > ARRAY_SIZE(fsl_sai_reg_defaults_ofs8); > } > > - sai->regmap = devm_regmap_init_mmio(&pdev->dev, base, > &fsl_sai_regmap_config); > + sai->regmap = devm_regmap_init_mmio(dev, base, > &fsl_sai_regmap_config); > if (IS_ERR(sai->regmap)) { > - dev_err(&pdev->dev, "regmap init failed\n"); > + dev_err(dev, "regmap init failed\n"); > return PTR_ERR(sai->regmap); > } > > - sai->bus_clk = devm_clk_get(&pdev->dev, "bus"); > + sai->bus_clk = devm_clk_get(dev, "bus"); > /* Compatible with old DTB cases */ > if (IS_ERR(sai->bus_clk) && PTR_ERR(sai->bus_clk) != -EPROBE_DEFER) > - sai->bus_clk = devm_clk_get(&pdev->dev, "sai"); > + sai->bus_clk = devm_clk_get(dev, "sai"); > if (IS_ERR(sai->bus_clk)) { > - dev_err(&pdev->dev, "failed to get bus clock: %ld\n", > + dev_err(dev, "failed to get bus clock: %ld\n", > PTR_ERR(sai->bus_clk)); > /* -EPROBE_DEFER */ > return PTR_ERR(sai->bus_clk); > @@ -1051,9 +1052,9 @@ static int fsl_sai_probe(struct platform_device > *pdev) > > for (i = 1; i < FSL_SAI_MCLK_MAX; i++) { > sprintf(tmp, "mclk%d", i); > - sai->mclk_clk[i] = devm_clk_get(&pdev->dev, tmp); > + sai->mclk_clk[i] = devm_clk_get(dev, tmp); > if (IS_ERR(sai->mclk_clk[i])) { > - dev_err(&pdev->dev, "failed to get mclk%d clock: > %ld\n", > + dev_err(dev, "failed to get mclk%d clock: %ld\n", > i + 1, PTR_ERR(sai->mclk_clk[i])); > sai->mclk_clk[i] = NULL; > } > @@ -1068,10 +1069,10 @@ static int fsl_sai_probe(struct platform_device > *pdev) > if (irq < 0) > return irq; > > - ret = devm_request_irq(&pdev->dev, irq, fsl_sai_isr, IRQF_SHARED, > + ret = devm_request_irq(dev, irq, fsl_sai_isr, IRQF_SHARED, > np->name, sai); > if (ret) { > - dev_err(&pdev->dev, "failed to claim irq %u\n", irq); > + dev_err(dev, "failed to claim irq %u\n", irq); > return ret; > } > > @@ -1088,7 +1089,7 @@ static int fsl_sai_probe(struct platform_device > *pdev) > if (of_find_property(np, "fsl,sai-synchronous-rx", NULL) && > of_find_property(np, "fsl,sai-asynchronous", NULL)) { > /* error out if both synchronous and asynchronous are > present */ > - dev_err(&pdev->dev, "invalid binding for synchronous > mode\n"); > + dev_err(dev, "invalid binding for synchronous mode\n"); > return -EINVAL; > } > > @@ -1109,7 +1110,7 @@ static int fsl_sai_probe(struct platform_device > *pdev) > of_device_is_compatible(np, "fsl,imx6ul-sai")) { > gpr = > syscon_regmap_lookup_by_compatible("fsl,imx6ul-iomuxc-gpr"); > if (IS_ERR(gpr)) { > - dev_err(&pdev->dev, "cannot find iomuxc > registers\n"); > + dev_err(dev, "cannot find iomuxc registers\n"); > return PTR_ERR(gpr); > } > > @@ -1127,23 +1128,23 @@ static int fsl_sai_probe(struct platform_device > *pdev) > sai->dma_params_tx.maxburst = FSL_SAI_MAXBURST_TX; > > platform_set_drvdata(pdev, sai); > - pm_runtime_enable(&pdev->dev); > - if (!pm_runtime_enabled(&pdev->dev)) { > - ret = fsl_sai_runtime_resume(&pdev->dev); > + pm_runtime_enable(dev); > + if (!pm_runtime_enabled(dev)) { > + ret = fsl_sai_runtime_resume(dev); > if (ret) > goto err_pm_disable; > } > > - ret = pm_runtime_get_sync(&pdev->dev); > + ret = pm_runtime_get_sync(dev); > if (ret < 0) { > - pm_runtime_put_noidle(&pdev->dev); > + pm_runtime_put_noidle(dev); > goto err_pm_get_sync; > } > > /* Get sai version */ > - ret = fsl_sai_check_version(&pdev->dev); > + ret = fsl_sai_check_version(dev); > if (ret < 0) > - dev_warn(&pdev->dev, "Error reading SAI version: %d\n", > ret); > + dev_warn(dev, "Error reading SAI version: %d\n", ret); > > /* Select MCLK direction */ > if (of_find_property(np, "fsl,sai-mclk-direction-output", NULL) && > @@ -1152,7 +1153,7 @@ static int fsl_sai_probe(struct platform_device > *pdev) > FSL_SAI_MCTL_MCLK_EN, > FSL_SAI_MCTL_MCLK_EN); > } > > - ret = pm_runtime_put_sync(&pdev->dev); > + ret = pm_runtime_put_sync(dev); > if (ret < 0) > goto err_pm_get_sync; > > @@ -1165,12 +1166,12 @@ static int fsl_sai_probe(struct platform_device > *pdev) > if (ret) > goto err_pm_get_sync; > } else { > - ret = devm_snd_dmaengine_pcm_register(&pdev->dev, NULL, 0); > + ret = devm_snd_dmaengine_pcm_register(dev, NULL, 0); > if (ret) > goto err_pm_get_sync; > } > > - ret = devm_snd_soc_register_component(&pdev->dev, &fsl_component, > + ret = devm_snd_soc_register_component(dev, &fsl_component, > &sai->cpu_dai_drv, 1); > if (ret) > goto err_pm_get_sync; > @@ -1178,10 +1179,10 @@ static int fsl_sai_probe(struct platform_device > *pdev) > return ret; > > err_pm_get_sync: > - if (!pm_runtime_status_suspended(&pdev->dev)) > - fsl_sai_runtime_suspend(&pdev->dev); > + if (!pm_runtime_status_suspended(dev)) > + fsl_sai_runtime_suspend(dev); > err_pm_disable: > - pm_runtime_disable(&pdev->dev); > + pm_runtime_disable(dev); > > return ret; > } > -- > 2.30.2 > >
On Wed, 1 Jun 2022 11:23:40 +0200, Marco Felsch wrote: > Use a local variable to dereference the device pointer once and use the > local variable in further calls. No functional changes. > > Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next Thanks! [1/3] ASoC: fsl_sai: use local device pointer commit: f53f50ee21d46094a8c48970e95e38a4deaa128e [3/3] ASoC: fsl_sai: add error message in case of missing imx-pcm-dma support commit: 22205521770ee740f64a3ec90301f50e34738cfd 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/fsl/fsl_sai.c b/sound/soc/fsl/fsl_sai.c index fa950dde5310..a7637d602f3c 100644 --- a/sound/soc/fsl/fsl_sai.c +++ b/sound/soc/fsl/fsl_sai.c @@ -1004,6 +1004,7 @@ static int fsl_sai_runtime_resume(struct device *dev); static int fsl_sai_probe(struct platform_device *pdev) { struct device_node *np = pdev->dev.of_node; + struct device *dev = &pdev->dev; struct fsl_sai *sai; struct regmap *gpr; struct resource *res; @@ -1012,12 +1013,12 @@ static int fsl_sai_probe(struct platform_device *pdev) int irq, ret, i; int index; - sai = devm_kzalloc(&pdev->dev, sizeof(*sai), GFP_KERNEL); + sai = devm_kzalloc(dev, sizeof(*sai), GFP_KERNEL); if (!sai) return -ENOMEM; sai->pdev = pdev; - sai->soc_data = of_device_get_match_data(&pdev->dev); + sai->soc_data = of_device_get_match_data(dev); sai->is_lsb_first = of_property_read_bool(np, "lsb-first"); @@ -1032,18 +1033,18 @@ static int fsl_sai_probe(struct platform_device *pdev) ARRAY_SIZE(fsl_sai_reg_defaults_ofs8); } - sai->regmap = devm_regmap_init_mmio(&pdev->dev, base, &fsl_sai_regmap_config); + sai->regmap = devm_regmap_init_mmio(dev, base, &fsl_sai_regmap_config); if (IS_ERR(sai->regmap)) { - dev_err(&pdev->dev, "regmap init failed\n"); + dev_err(dev, "regmap init failed\n"); return PTR_ERR(sai->regmap); } - sai->bus_clk = devm_clk_get(&pdev->dev, "bus"); + sai->bus_clk = devm_clk_get(dev, "bus"); /* Compatible with old DTB cases */ if (IS_ERR(sai->bus_clk) && PTR_ERR(sai->bus_clk) != -EPROBE_DEFER) - sai->bus_clk = devm_clk_get(&pdev->dev, "sai"); + sai->bus_clk = devm_clk_get(dev, "sai"); if (IS_ERR(sai->bus_clk)) { - dev_err(&pdev->dev, "failed to get bus clock: %ld\n", + dev_err(dev, "failed to get bus clock: %ld\n", PTR_ERR(sai->bus_clk)); /* -EPROBE_DEFER */ return PTR_ERR(sai->bus_clk); @@ -1051,9 +1052,9 @@ static int fsl_sai_probe(struct platform_device *pdev) for (i = 1; i < FSL_SAI_MCLK_MAX; i++) { sprintf(tmp, "mclk%d", i); - sai->mclk_clk[i] = devm_clk_get(&pdev->dev, tmp); + sai->mclk_clk[i] = devm_clk_get(dev, tmp); if (IS_ERR(sai->mclk_clk[i])) { - dev_err(&pdev->dev, "failed to get mclk%d clock: %ld\n", + dev_err(dev, "failed to get mclk%d clock: %ld\n", i + 1, PTR_ERR(sai->mclk_clk[i])); sai->mclk_clk[i] = NULL; } @@ -1068,10 +1069,10 @@ static int fsl_sai_probe(struct platform_device *pdev) if (irq < 0) return irq; - ret = devm_request_irq(&pdev->dev, irq, fsl_sai_isr, IRQF_SHARED, + ret = devm_request_irq(dev, irq, fsl_sai_isr, IRQF_SHARED, np->name, sai); if (ret) { - dev_err(&pdev->dev, "failed to claim irq %u\n", irq); + dev_err(dev, "failed to claim irq %u\n", irq); return ret; } @@ -1088,7 +1089,7 @@ static int fsl_sai_probe(struct platform_device *pdev) if (of_find_property(np, "fsl,sai-synchronous-rx", NULL) && of_find_property(np, "fsl,sai-asynchronous", NULL)) { /* error out if both synchronous and asynchronous are present */ - dev_err(&pdev->dev, "invalid binding for synchronous mode\n"); + dev_err(dev, "invalid binding for synchronous mode\n"); return -EINVAL; } @@ -1109,7 +1110,7 @@ static int fsl_sai_probe(struct platform_device *pdev) of_device_is_compatible(np, "fsl,imx6ul-sai")) { gpr = syscon_regmap_lookup_by_compatible("fsl,imx6ul-iomuxc-gpr"); if (IS_ERR(gpr)) { - dev_err(&pdev->dev, "cannot find iomuxc registers\n"); + dev_err(dev, "cannot find iomuxc registers\n"); return PTR_ERR(gpr); } @@ -1127,23 +1128,23 @@ static int fsl_sai_probe(struct platform_device *pdev) sai->dma_params_tx.maxburst = FSL_SAI_MAXBURST_TX; platform_set_drvdata(pdev, sai); - pm_runtime_enable(&pdev->dev); - if (!pm_runtime_enabled(&pdev->dev)) { - ret = fsl_sai_runtime_resume(&pdev->dev); + pm_runtime_enable(dev); + if (!pm_runtime_enabled(dev)) { + ret = fsl_sai_runtime_resume(dev); if (ret) goto err_pm_disable; } - ret = pm_runtime_get_sync(&pdev->dev); + ret = pm_runtime_get_sync(dev); if (ret < 0) { - pm_runtime_put_noidle(&pdev->dev); + pm_runtime_put_noidle(dev); goto err_pm_get_sync; } /* Get sai version */ - ret = fsl_sai_check_version(&pdev->dev); + ret = fsl_sai_check_version(dev); if (ret < 0) - dev_warn(&pdev->dev, "Error reading SAI version: %d\n", ret); + dev_warn(dev, "Error reading SAI version: %d\n", ret); /* Select MCLK direction */ if (of_find_property(np, "fsl,sai-mclk-direction-output", NULL) && @@ -1152,7 +1153,7 @@ static int fsl_sai_probe(struct platform_device *pdev) FSL_SAI_MCTL_MCLK_EN, FSL_SAI_MCTL_MCLK_EN); } - ret = pm_runtime_put_sync(&pdev->dev); + ret = pm_runtime_put_sync(dev); if (ret < 0) goto err_pm_get_sync; @@ -1165,12 +1166,12 @@ static int fsl_sai_probe(struct platform_device *pdev) if (ret) goto err_pm_get_sync; } else { - ret = devm_snd_dmaengine_pcm_register(&pdev->dev, NULL, 0); + ret = devm_snd_dmaengine_pcm_register(dev, NULL, 0); if (ret) goto err_pm_get_sync; } - ret = devm_snd_soc_register_component(&pdev->dev, &fsl_component, + ret = devm_snd_soc_register_component(dev, &fsl_component, &sai->cpu_dai_drv, 1); if (ret) goto err_pm_get_sync; @@ -1178,10 +1179,10 @@ static int fsl_sai_probe(struct platform_device *pdev) return ret; err_pm_get_sync: - if (!pm_runtime_status_suspended(&pdev->dev)) - fsl_sai_runtime_suspend(&pdev->dev); + if (!pm_runtime_status_suspended(dev)) + fsl_sai_runtime_suspend(dev); err_pm_disable: - pm_runtime_disable(&pdev->dev); + pm_runtime_disable(dev); return ret; }
Use a local variable to dereference the device pointer once and use the local variable in further calls. No functional changes. Signed-off-by: Marco Felsch <m.felsch@pengutronix.de> --- sound/soc/fsl/fsl_sai.c | 53 +++++++++++++++++++++-------------------- 1 file changed, 27 insertions(+), 26 deletions(-)