[PATCH] staging: dwc2: use devm_ioremap_resource()

[PATCH] staging: dwc2: use devm_ioremap_resource()

[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>
---
 drivers/staging/dwc2/pci.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/staging/dwc2/pci.c b/drivers/staging/dwc2/pci.c
index 69c65eb..407e021 100644
--- a/drivers/staging/dwc2/pci.c
+++ b/drivers/staging/dwc2/pci.c
@@ -134,9 +134,9 @@ static int dwc2_driver_probe(struct pci_dev *dev,
 	pci_set_power_state(dev, PCI_D0);
 
 	hsotg->dev = &dev->dev;
-	hsotg->regs = devm_request_and_ioremap(&dev->dev, &dev->resource[0]);
-	if (!hsotg->regs)
-		return -ENOMEM;
+	hsotg->regs = devm_ioremap_resource(&dev->dev, &dev->resource[0]);
+	if (IS_ERR(hsotg->regs))
+		return PTR_ERR(hsotg->regs);
 
 	dev_dbg(&dev->dev, "mapped PA %08lx to VA %p\n",
 		(unsigned long)pci_resource_start(dev, 0), hsotg->regs);
-- 
1.7.10.4

Re: [PATCH] staging: dwc2: use devm_ioremap_resource()

[Matthijs Kooijman]

Hi Laurent,

On Thu, May 02, 2013 at 01:23:17PM +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>
> ---
>  drivers/staging/dwc2/pci.c |    6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
Patch looks good, I had a bit-for-bit identical patch in my queue here
as well :-)

Reviewed-by: Matthijs Kooijman <matthijs@stdin.nl>

Gr.

Matthijs

> diff --git a/drivers/staging/dwc2/pci.c b/drivers/staging/dwc2/pci.c
> index 69c65eb..407e021 100644
> --- a/drivers/staging/dwc2/pci.c
> +++ b/drivers/staging/dwc2/pci.c
> @@ -134,9 +134,9 @@ static int dwc2_driver_probe(struct pci_dev *dev,
>  	pci_set_power_state(dev, PCI_D0);
>  
>  	hsotg->dev = &dev->dev;
> -	hsotg->regs = devm_request_and_ioremap(&dev->dev, &dev->resource[0]);
> -	if (!hsotg->regs)
> -		return -ENOMEM;
> +	hsotg->regs = devm_ioremap_resource(&dev->dev, &dev->resource[0]);
> +	if (IS_ERR(hsotg->regs))
> +		return PTR_ERR(hsotg->regs);
>  
>  	dev_dbg(&dev->dev, "mapped PA %08lx to VA %p\n",
>  		(unsigned long)pci_resource_start(dev, 0), hsotg->regs);
> -- 
> 1.7.10.4
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-usb" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

RE: [PATCH] staging: dwc2: use devm_ioremap_resource()

[Paul Zimmerman]

> From: Matthijs Kooijman [mailto:matthijs@stdin.nl]
> Sent: Thursday, May 02, 2013 4:22 AM
> 
> On Thu, May 02, 2013 at 01:23:17PM +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>
> > ---
> >  drivers/staging/dwc2/pci.c |    6 +++---
> >  1 file changed, 3 insertions(+), 3 deletions(-)
> >
> Patch looks good, I had a bit-for-bit identical patch in my queue here
> as well :-)
> 
> Reviewed-by: Matthijs Kooijman <matthijs@stdin.nl>

Acked-by: Paul Zimmerman <paulz@synopsys.com>