arch: sparc: kernel: use devm_ioremap_resource()
PATCH 1/1 arch: sparc: kernel: use devm_ioremap_resource()
Replace a call to deprecated devm_request_and_ioremap by devm_ioremap_resource.
Found with coccicheck and this semantic patch:
scripts/coccinelle/api/devm_request_and_ioremap.cocci.
--- arch/sparc/kernel/leon_pci_grpci1.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)
arch/sparc/kernel/leon_pci_grpci1.c +3 -5
@@ -536,11 +536,9 @@ static int grpci1_of_probe(struct platform_device *ofdev)/* find device register base address */ res =platform_get_resource (ofdev,IORESOURCE_MEM ,0 ); - regs =devm_request_and_ioremap (&ofdev->dev, res); -if (!regs) { -dev_err (&ofdev->dev,"io-regs mapping failed\n" ); -return -EADDRNOTAVAIL ; - } + regs =devm_ioremap_resource (&ofdev->dev, res); +if (IS_ERR (regs)) +return PTR_ERR (regs);/* * check that we're in Host Slot and that we can act as a Host Bridge
Signature · 1 line
1.7.10.4
Quoted 16 lines · Laurent Navet
Replace a call to deprecated
devm_request_and_ioremapbydevm_ioremap_resource.Found with coccicheck and this semantic patch:
scripts/coccinelle/api/devm_request_and_ioremap.cocci.Signed-off-by Laurent Navet <[email protected]>--- arch/sparc/kernel/leon_pci_grpci1.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)arch/sparc/kernel/leon_pci_grpci1.c +0
-0@@ -536,11 +536,9 @@ static int grpci1_of_probe(struct platform_device *ofdev)
arch/sparc/kernel/leon_pci_grpci1.c static int grpci1_of_probe(struct platform_device *ofdev) · line 541
Quoted 10 lines
arch/sparc/kernel/leon_pci_grpci1.c +3
-5/* find device register base address */ res =platform_get_resource (ofdev,IORESOURCE_MEM ,0 ); - regs =devm_request_and_ioremap (&ofdev->dev, res); -if (!regs) { -dev_err (&ofdev->dev,"io-regs mapping failed\n" ); -return -EADDRNOTAVAIL ; - } + regs =devm_ioremap_resource (&ofdev->dev, res); +if (IS_ERR (regs)) +return PTR_ERR (regs);
This looks bogus. The function return an int - not a pointer.
Sam
The same is done almost everywhere in kernel tree :
e.g :
http://lxr.free-electrons.com/source/drivers/staging/iio/adc/mxs-lradc.c#L928
http://lxr.free-electrons.com/source/drivers/gpio/gpio-mxs.c#L292
http://lxr.free-electrons.com/source/drivers/iommu/tegra-smmu.c#L1181
http://lxr.free-electrons.com/source/drivers/rtc/rtc-spear.c#L388
http://lxr.free-electrons.com/source/drivers/i2c/busses/i2c-imx.c#L514
http://lxr.free-electrons.com/source/sound/soc/kirkwood/kirkwood-i2s.c#L475
and so on... all theses functions return an int.
Regards,
Laurent.
2013/5/12, Sam Ravnborg <[email protected]>:
Quoted 35 lines · Laurent Navet
Quoted 19 lines
Replace a call to deprecated
devm_request_and_ioremapbydevm_ioremap_resource.Found with coccicheck and this semantic patch:
scripts/coccinelle/api/devm_request_and_ioremap.cocci.Signed-off-by Laurent Navet <[email protected]>--- arch/sparc/kernel/leon_pci_grpci1.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)arch/sparc/kernel/leon_pci_grpci1.c +0
-0@@ -536,11 +536,9 @@ static int grpci1_of_probe(struct platform_device *ofdev)arch/sparc/kernel/leon_pci_grpci1.c static int grpci1_of_probe(struct platform_device · line 542
Quoted 10 lines
arch/sparc/kernel/leon_pci_grpci1.c +3
-5/* find device register base address */ res =platform_get_resource (ofdev,IORESOURCE_MEM ,0 ); - regs =devm_request_and_ioremap (&ofdev->dev, res); -if (!regs) { -dev_err (&ofdev->dev,"io-regs mapping failed\n" ); -return -EADDRNOTAVAIL ; - } + regs =devm_ioremap_resource (&ofdev->dev, res); +if (IS_ERR (regs)) +return PTR_ERR (regs);This looks bogus. The function return an int - not a pointer.
Sam
Signature · 3 lines
« On ne résout pas un problème avec les modes de pensée qui l’ont engendré. » « You cannot solve current problems with current thinking. Current problems are the result of current thinking »
Sam Ravnborg
Acked-byQuoted 11 lines · Laurent Navet
The same is done almost everywhere in kernel tree :
e.g :
http://lxr.free-electrons.com/source/drivers/staging/iio/adc/mxs-lradc.c#L928
http://lxr.free-electrons.com/source/drivers/gpio/gpio-mxs.c#L292
http://lxr.free-electrons.com/source/drivers/iommu/tegra-smmu.c#L1181
http://lxr.free-electrons.com/source/drivers/rtc/rtc-spear.c#L388
http://lxr.free-electrons.com/source/drivers/i2c/busses/i2c-imx.c#L514
http://lxr.free-electrons.com/source/sound/soc/kirkwood/kirkwood-i2s.c#L475and so on... all theses functions return an int.
I was confusing PTR_ERR() and ERR_PTR(),
so path looks ok.