[alsa-devel] [PATCH 00/27] devm cleanup, part #1, take #3
Here is another bit of cleaning up the devm usage. It is again removing the resource check with devm_ioremap_resource, because a) new drivers came in and b) coccinelle had a bug and missed to find a couple of occasions. Unlike last time, I think it is better if these patches go in via the subsystem trees to reduce merge conflicts. And there is one driver which I fixed manually because the original code needed some bigger update. All is based on v3.11-rc2 and the branch can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git devm_no_resource_check
Other things which happened: I wanted to get rid of devm_request_and_ioremap, luckily other people are already working on it. Hooray! I already sent a patch series picking another low hanging fruit, i.e. drivers can skip devm_pinctrl handling if they are using only the default pin setup. And not devm related, there is still my proposal to rename INIT_COMPLETION to reinit_completion, that probably needs some more persistence... Yay, so much to clean up \o/
Regards,
Wolfram
Wolfram Sang (27): arch/mips/lantiq/xway: don't check resource with devm_ioremap_resource drivers/amba: don't check resource with devm_ioremap_resource drivers/cpuidle: don't check resource with devm_ioremap_resource drivers/dma: don't check resource with devm_ioremap_resource drivers/gpu/host1x/drm: don't check resource with devm_ioremap_resource drivers/i2c/busses: don't check resource with devm_ioremap_resource drivers/input/serio: don't check resource with devm_ioremap_resource drivers/iommu: don't check resource with devm_ioremap_resource drivers/media/platform: don't check resource with devm_ioremap_resource drivers/memory: don't check resource with devm_ioremap_resource drivers/mtd/nand: don't check resource with devm_ioremap_resource drivers/net/ethernet/stmicro/stmmac: don't check resource with devm_ioremap_resource drivers/pci/host: don't check resource with devm_ioremap_resource drivers/pinctrl: don't check resource with devm_ioremap_resource drivers/pwm: don't check resource with devm_ioremap_resource drivers/scsi/ufs: don't check resource with devm_ioremap_resource drivers/spi: don't check resource with devm_ioremap_resource drivers/staging/imx-drm: don't check resource with devm_ioremap_resource drivers/usb/phy: don't check resource with devm_ioremap_resource drivers/watchdog: don't check resource with devm_ioremap_resource sound/soc/au1x: don't check resource with devm_ioremap_resource sound/soc/cirrus: don't check resource with devm_ioremap_resource sound/soc/nuc900: don't check resource with devm_ioremap_resource sound/soc/pxa: don't check resource with devm_ioremap_resource sound/soc/tegra: don't check resource with devm_ioremap_resource sound/soc/txx9: don't check resource with devm_ioremap_resource thermal: ti-bandgap: cleanup resource allocation
arch/mips/lantiq/xway/dma.c | 4 ---- drivers/amba/tegra-ahb.c | 2 -- drivers/cpuidle/cpuidle-kirkwood.c | 3 --- drivers/dma/mmp_pdma.c | 3 --- drivers/dma/mmp_tdma.c | 3 --- drivers/gpu/host1x/drm/hdmi.c | 3 --- drivers/i2c/busses/i2c-stu300.c | 3 --- drivers/input/serio/olpc_apsp.c | 3 --- drivers/iommu/tegra-smmu.c | 2 -- drivers/media/platform/coda.c | 5 ----- drivers/memory/tegra20-mc.c | 2 -- drivers/memory/tegra30-mc.c | 2 -- drivers/mtd/nand/mxc_nand.c | 5 ----- .../net/ethernet/stmicro/stmmac/stmmac_platform.c | 3 --- drivers/pci/host/pcie-designware.c | 12 ------------ drivers/pinctrl/pinctrl-imx.c | 3 --- drivers/pinctrl/pinctrl-rockchip.c | 5 ----- drivers/pinctrl/pinctrl-u300.c | 3 --- drivers/pwm/pwm-lpc32xx.c | 3 --- drivers/pwm/pwm-renesas-tpu.c | 5 ----- drivers/scsi/ufs/ufshcd-pltfrm.c | 6 ------ drivers/spi/spi-bcm2835.c | 6 ------ drivers/staging/imx-drm/imx-tve.c | 5 ----- drivers/thermal/ti-soc-thermal/ti-bandgap.c | 20 ++++---------------- drivers/usb/phy/phy-rcar-usb.c | 5 ----- drivers/watchdog/nuc900_wdt.c | 5 ----- drivers/watchdog/ts72xx_wdt.c | 10 ---------- sound/soc/au1x/psc-ac97.c | 3 --- sound/soc/cirrus/ep93xx-ac97.c | 3 --- sound/soc/cirrus/ep93xx-i2s.c | 3 --- sound/soc/nuc900/nuc900-ac97.c | 3 --- sound/soc/pxa/mmp-sspa.c | 3 --- sound/soc/tegra/tegra20_ac97.c | 7 ------- sound/soc/txx9/txx9aclc-ac97.c | 3 --- 34 files changed, 4 insertions(+), 152 deletions(-)
devm_ioremap_resource does sanity checks on the given resource. No need to duplicate this in the driver.
Signed-off-by: Wolfram Sang wsa@the-dreams.de --- Please apply via the subsystem-tree.
sound/soc/au1x/psc-ac97.c | 3 --- 1 file changed, 3 deletions(-)
diff --git a/sound/soc/au1x/psc-ac97.c b/sound/soc/au1x/psc-ac97.c index a822ab8..986dcec 100644 --- a/sound/soc/au1x/psc-ac97.c +++ b/sound/soc/au1x/psc-ac97.c @@ -379,9 +379,6 @@ static int au1xpsc_ac97_drvprobe(struct platform_device *pdev) mutex_init(&wd->lock);
iores = platform_get_resource(pdev, IORESOURCE_MEM, 0); - if (!iores) - return -ENODEV; - wd->mmio = devm_ioremap_resource(&pdev->dev, iores); if (IS_ERR(wd->mmio)) return PTR_ERR(wd->mmio);
On Tue, Jul 23, 2013 at 08:01:54PM +0200, Wolfram Sang wrote:
devm_ioremap_resource does sanity checks on the given resource. No need to duplicate this in the driver.
Appiled, thanks.
devm_ioremap_resource does sanity checks on the given resource. No need to duplicate this in the driver.
Signed-off-by: Wolfram Sang wsa@the-dreams.de --- Please apply via the subsystem-tree.
sound/soc/cirrus/ep93xx-ac97.c | 3 --- sound/soc/cirrus/ep93xx-i2s.c | 3 --- 2 files changed, 6 deletions(-)
diff --git a/sound/soc/cirrus/ep93xx-ac97.c b/sound/soc/cirrus/ep93xx-ac97.c index ac73c60..2a5cdae 100644 --- a/sound/soc/cirrus/ep93xx-ac97.c +++ b/sound/soc/cirrus/ep93xx-ac97.c @@ -363,9 +363,6 @@ static int ep93xx_ac97_probe(struct platform_device *pdev) return -ENOMEM;
res = platform_get_resource(pdev, IORESOURCE_MEM, 0); - if (!res) - return -ENODEV; - info->regs = devm_ioremap_resource(&pdev->dev, res); if (IS_ERR(info->regs)) return PTR_ERR(info->regs); diff --git a/sound/soc/cirrus/ep93xx-i2s.c b/sound/soc/cirrus/ep93xx-i2s.c index 17ad70b..f23f331 100644 --- a/sound/soc/cirrus/ep93xx-i2s.c +++ b/sound/soc/cirrus/ep93xx-i2s.c @@ -376,9 +376,6 @@ static int ep93xx_i2s_probe(struct platform_device *pdev) return -ENOMEM;
res = platform_get_resource(pdev, IORESOURCE_MEM, 0); - if (!res) - return -ENODEV; - info->regs = devm_ioremap_resource(&pdev->dev, res); if (IS_ERR(info->regs)) return PTR_ERR(info->regs);
On Tue, Jul 23, 2013 at 08:01:55PM +0200, Wolfram Sang wrote:
devm_ioremap_resource does sanity checks on the given resource. No need to duplicate this in the driver.
Applied, thanks.
devm_ioremap_resource does sanity checks on the given resource. No need to duplicate this in the driver.
Signed-off-by: Wolfram Sang wsa@the-dreams.de --- Please apply via the subsystem-tree.
sound/soc/nuc900/nuc900-ac97.c | 3 --- 1 file changed, 3 deletions(-)
diff --git a/sound/soc/nuc900/nuc900-ac97.c b/sound/soc/nuc900/nuc900-ac97.c index f4c2417..8987bf9 100644 --- a/sound/soc/nuc900/nuc900-ac97.c +++ b/sound/soc/nuc900/nuc900-ac97.c @@ -333,9 +333,6 @@ static int nuc900_ac97_drvprobe(struct platform_device *pdev) spin_lock_init(&nuc900_audio->lock);
nuc900_audio->res = platform_get_resource(pdev, IORESOURCE_MEM, 0); - if (!nuc900_audio->res) - return ret; - nuc900_audio->mmio = devm_ioremap_resource(&pdev->dev, nuc900_audio->res); if (IS_ERR(nuc900_audio->mmio))
On Tue, Jul 23, 2013 at 08:01:56PM +0200, Wolfram Sang wrote:
devm_ioremap_resource does sanity checks on the given resource. No need to duplicate this in the driver.
Applied, thanks.
devm_ioremap_resource does sanity checks on the given resource. No need to duplicate this in the driver.
Signed-off-by: Wolfram Sang wsa@the-dreams.de --- Please apply via the subsystem-tree.
sound/soc/pxa/mmp-sspa.c | 3 --- 1 file changed, 3 deletions(-)
diff --git a/sound/soc/pxa/mmp-sspa.c b/sound/soc/pxa/mmp-sspa.c index 62142ce..1605934 100644 --- a/sound/soc/pxa/mmp-sspa.c +++ b/sound/soc/pxa/mmp-sspa.c @@ -430,9 +430,6 @@ static int asoc_mmp_sspa_probe(struct platform_device *pdev) return -ENOMEM;
res = platform_get_resource(pdev, IORESOURCE_MEM, 0); - if (res == NULL) - return -ENOMEM; - priv->sspa->mmio_base = devm_ioremap_resource(&pdev->dev, res); if (IS_ERR(priv->sspa->mmio_base)) return PTR_ERR(priv->sspa->mmio_base);
On Tue, Jul 23, 2013 at 08:01:57PM +0200, Wolfram Sang wrote:
devm_ioremap_resource does sanity checks on the given resource. No need to duplicate this in the driver.
Applied, thanks.
devm_ioremap_resource does sanity checks on the given resource. No need to duplicate this in the driver.
Signed-off-by: Wolfram Sang wsa@the-dreams.de --- Please apply via the subsystem-tree.
sound/soc/tegra/tegra20_ac97.c | 7 ------- 1 file changed, 7 deletions(-)
diff --git a/sound/soc/tegra/tegra20_ac97.c b/sound/soc/tegra/tegra20_ac97.c index e58233f..ef3d0e0 100644 --- a/sound/soc/tegra/tegra20_ac97.c +++ b/sound/soc/tegra/tegra20_ac97.c @@ -334,12 +334,6 @@ static int tegra20_ac97_platform_probe(struct platform_device *pdev) }
mem = platform_get_resource(pdev, IORESOURCE_MEM, 0); - if (!mem) { - dev_err(&pdev->dev, "No memory resource\n"); - ret = -ENODEV; - goto err_clk_put; - } - regs = devm_ioremap_resource(&pdev->dev, mem); if (IS_ERR(regs)) { ret = PTR_ERR(regs); @@ -432,7 +426,6 @@ static int tegra20_ac97_platform_probe(struct platform_device *pdev)
return 0;
-err_unregister_pcm: tegra_pcm_platform_unregister(&pdev->dev); err_unregister_component: snd_soc_unregister_component(&pdev->dev);
On Tue, Jul 23, 2013 at 08:01:58PM +0200, Wolfram Sang wrote:
devm_ioremap_resource does sanity checks on the given resource. No need to duplicate this in the driver.
This doesn't seem to apply against my current branch, can you please check and resend?
devm_ioremap_resource does sanity checks on the given resource. No need to duplicate this in the driver.
Signed-off-by: Wolfram Sang wsa@the-dreams.de --- Please apply via the subsystem-tree.
sound/soc/txx9/txx9aclc-ac97.c | 3 --- 1 file changed, 3 deletions(-)
diff --git a/sound/soc/txx9/txx9aclc-ac97.c b/sound/soc/txx9/txx9aclc-ac97.c index 4bcce8a..e0305a1 100644 --- a/sound/soc/txx9/txx9aclc-ac97.c +++ b/sound/soc/txx9/txx9aclc-ac97.c @@ -184,9 +184,6 @@ static int txx9aclc_ac97_dev_probe(struct platform_device *pdev) if (irq < 0) return irq; r = platform_get_resource(pdev, IORESOURCE_MEM, 0); - if (!r) - return -EBUSY; - drvdata->base = devm_ioremap_resource(&pdev->dev, r); if (IS_ERR(drvdata->base)) return PTR_ERR(drvdata->base);
On Tue, Jul 23, 2013 at 08:01:59PM +0200, Wolfram Sang wrote:
devm_ioremap_resource does sanity checks on the given resource. No need to duplicate this in the driver.
Applied, thanks.
participants (2)
-
Mark Brown -
Wolfram Sang