2013-05-02 11:15:25

by Laurent Navet

Subject: [PATCH] staging: dwc2: 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.

Signed-off-by: Laurent Navet <[email protected]>
---
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

2013-05-02 11:22:38

by Matthijs Kooijman

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

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 <[email protected]>
> ---
> 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 <[email protected]>

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 [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html

2013-05-02 17:47:24

by Paul Zimmerman

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

> From: Matthijs Kooijman [mailto:[email protected]]
> 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 <[email protected]>
> > ---
> > 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 <[email protected]>

Acked-by: Paul Zimmerman <[email protected]>