All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] arch: sparc: kernel: use devm_ioremap_resource()
@ 2013-05-12 14:10 ` Laurent Navet
  0 siblings, 0 replies; 8+ messages in thread
From: Laurent Navet @ 2013-05-12 14:10 UTC (permalink / raw)
  To: davem; +Cc: daniel, sam, sparclinux, linux-kernel, Laurent Navet

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.

Signed-off-by: Laurent Navet <laurent.navet@gmail.com>
---
 arch/sparc/kernel/leon_pci_grpci1.c |    8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/arch/sparc/kernel/leon_pci_grpci1.c b/arch/sparc/kernel/leon_pci_grpci1.c
index 7739a54..6df26e3 100644
--- a/arch/sparc/kernel/leon_pci_grpci1.c
+++ b/arch/sparc/kernel/leon_pci_grpci1.c
@@ -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
-- 
1.7.10.4


^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [PATCH] arch: sparc: kernel: use devm_ioremap_resource()
@ 2013-05-12 14:10 ` Laurent Navet
  0 siblings, 0 replies; 8+ messages in thread
From: Laurent Navet @ 2013-05-12 14:10 UTC (permalink / raw)
  To: davem; +Cc: daniel, sam, sparclinux, linux-kernel, Laurent Navet

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.

Signed-off-by: Laurent Navet <laurent.navet@gmail.com>
---
 arch/sparc/kernel/leon_pci_grpci1.c |    8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/arch/sparc/kernel/leon_pci_grpci1.c b/arch/sparc/kernel/leon_pci_grpci1.c
index 7739a54..6df26e3 100644
--- a/arch/sparc/kernel/leon_pci_grpci1.c
+++ b/arch/sparc/kernel/leon_pci_grpci1.c
@@ -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
-- 
1.7.10.4


^ permalink raw reply related	[flat|nested] 8+ messages in thread
* Re: [PATCH] arch: sparc: kernel: use devm_ioremap_resource()
  2013-05-12 14:10 ` Laurent Navet
@ 2013-05-12 15:28   ` Sam Ravnborg
  -1 siblings, 0 replies; 8+ messages in thread
From: Sam Ravnborg @ 2013-05-12 15:28 UTC (permalink / raw)
  To: Laurent Navet; +Cc: davem, daniel, sparclinux, linux-kernel

On Sun, May 12, 2013 at 04:10:07PM +0200, Laurent Navet wrote:
> 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.
> 
> Signed-off-by: Laurent Navet <laurent.navet@gmail.com>
> ---
>  arch/sparc/kernel/leon_pci_grpci1.c |    8 +++-----
>  1 file changed, 3 insertions(+), 5 deletions(-)
> 
> diff --git a/arch/sparc/kernel/leon_pci_grpci1.c b/arch/sparc/kernel/leon_pci_grpci1.c
> index 7739a54..6df26e3 100644
> --- a/arch/sparc/kernel/leon_pci_grpci1.c
> +++ b/arch/sparc/kernel/leon_pci_grpci1.c
> @@ -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);

This looks bogus. The function return an int - not a pointer.

	Sam

^ permalink raw reply	[flat|nested] 8+ messages in thread
* Re: [PATCH] arch: sparc: kernel: use devm_ioremap_resource()
@ 2013-05-12 15:28   ` Sam Ravnborg
  0 siblings, 0 replies; 8+ messages in thread
From: Sam Ravnborg @ 2013-05-12 15:28 UTC (permalink / raw)
  To: Laurent Navet; +Cc: davem, daniel, sparclinux, linux-kernel

On Sun, May 12, 2013 at 04:10:07PM +0200, Laurent Navet wrote:
> 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.
> 
> Signed-off-by: Laurent Navet <laurent.navet@gmail.com>
> ---
>  arch/sparc/kernel/leon_pci_grpci1.c |    8 +++-----
>  1 file changed, 3 insertions(+), 5 deletions(-)
> 
> diff --git a/arch/sparc/kernel/leon_pci_grpci1.c b/arch/sparc/kernel/leon_pci_grpci1.c
> index 7739a54..6df26e3 100644
> --- a/arch/sparc/kernel/leon_pci_grpci1.c
> +++ b/arch/sparc/kernel/leon_pci_grpci1.c
> @@ -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);

This looks bogus. The function return an int - not a pointer.

	Sam

^ permalink raw reply	[flat|nested] 8+ messages in thread
* Re: [PATCH] arch: sparc: kernel: use devm_ioremap_resource()
  2013-05-12 15:28   ` Sam Ravnborg
@ 2013-05-13 11:43     ` Laurent Navet
  -1 siblings, 0 replies; 8+ messages in thread
From: Laurent Navet @ 2013-05-13 11:43 UTC (permalink / raw)
  To: Sam Ravnborg; +Cc: davem, daniel, sparclinux, linux-kernel

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 <sam@ravnborg.org>:
> On Sun, May 12, 2013 at 04:10:07PM +0200, Laurent Navet wrote:
>> 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.
>>
>> Signed-off-by: Laurent Navet <laurent.navet@gmail.com>
>> ---
>>  arch/sparc/kernel/leon_pci_grpci1.c |    8 +++-----
>>  1 file changed, 3 insertions(+), 5 deletions(-)
>>
>> diff --git a/arch/sparc/kernel/leon_pci_grpci1.c
>> b/arch/sparc/kernel/leon_pci_grpci1.c
>> index 7739a54..6df26e3 100644
>> --- a/arch/sparc/kernel/leon_pci_grpci1.c
>> +++ b/arch/sparc/kernel/leon_pci_grpci1.c
>> @@ -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);
>
> This looks bogus. The function return an int - not a pointer.
>
> 	Sam
>


-- 
« 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 »

^ permalink raw reply	[flat|nested] 8+ messages in thread
* Re: [PATCH] arch: sparc: kernel: use devm_ioremap_resource()
@ 2013-05-13 11:43     ` Laurent Navet
  0 siblings, 0 replies; 8+ messages in thread
From: Laurent Navet @ 2013-05-13 11:43 UTC (permalink / raw)
  To: Sam Ravnborg; +Cc: davem, daniel, sparclinux, linux-kernel

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 <sam@ravnborg.org>:
> On Sun, May 12, 2013 at 04:10:07PM +0200, Laurent Navet wrote:
>> 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.
>>
>> Signed-off-by: Laurent Navet <laurent.navet@gmail.com>
>> ---
>>  arch/sparc/kernel/leon_pci_grpci1.c |    8 +++-----
>>  1 file changed, 3 insertions(+), 5 deletions(-)
>>
>> diff --git a/arch/sparc/kernel/leon_pci_grpci1.c
>> b/arch/sparc/kernel/leon_pci_grpci1.c
>> index 7739a54..6df26e3 100644
>> --- a/arch/sparc/kernel/leon_pci_grpci1.c
>> +++ b/arch/sparc/kernel/leon_pci_grpci1.c
>> @@ -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);
>
> This looks bogus. The function return an int - not a pointer.
>
> 	Sam
>


-- 
« 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 »

^ permalink raw reply	[flat|nested] 8+ messages in thread
* Re: [PATCH] arch: sparc: kernel: use devm_ioremap_resource()
  2013-05-13 11:43     ` Laurent Navet
@ 2013-05-13 15:37       ` Sam Ravnborg
  -1 siblings, 0 replies; 8+ messages in thread
From: Sam Ravnborg @ 2013-05-13 15:37 UTC (permalink / raw)
  To: Laurent Navet; +Cc: davem, daniel, sparclinux, linux-kernel

On Mon, May 13, 2013 at 01:43:17PM +0200, Laurent Navet wrote:
> 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.

I was confusing PTR_ERR() and ERR_PTR(),
so path looks ok.

Acked-by: Sam Ravnborg <sam@ravnborg.org>

^ permalink raw reply	[flat|nested] 8+ messages in thread
* Re: [PATCH] arch: sparc: kernel: use devm_ioremap_resource()
@ 2013-05-13 15:37       ` Sam Ravnborg
  0 siblings, 0 replies; 8+ messages in thread
From: Sam Ravnborg @ 2013-05-13 15:37 UTC (permalink / raw)
  To: Laurent Navet; +Cc: davem, daniel, sparclinux, linux-kernel

On Mon, May 13, 2013 at 01:43:17PM +0200, Laurent Navet wrote:
> 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.

I was confusing PTR_ERR() and ERR_PTR(),
so path looks ok.

Acked-by: Sam Ravnborg <sam@ravnborg.org>

^ permalink raw reply	[flat|nested] 8+ messages in thread
end of thread, other threads:[~2013-05-13 15:37 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-05-12 14:10 [PATCH] arch: sparc: kernel: use devm_ioremap_resource() Laurent Navet
2013-05-12 14:10 ` Laurent Navet
2013-05-12 15:28 ` Sam Ravnborg
2013-05-12 15:28   ` Sam Ravnborg
2013-05-13 11:43   ` Laurent Navet
2013-05-13 11:43     ` Laurent Navet
2013-05-13 15:37     ` Sam Ravnborg
2013-05-13 15:37       ` Sam Ravnborg

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.