Hello Sergei,
On Mon, Jan 22, 2018 at 06:34:21PM +0300, Sergei Shtylyov wrote:
> Hello!
>
> On 01/22/2018 06:21 PM, Ladislav Michl wrote:
>
> > As devm_ioremap_resource() checks for valid resource,
> > make use of it instead of testing ourselves. As a bonus
> > memory region is requested.
> >
> > Signed-off-by: Ladislav Michl <[email protected]>
> > ---
> > drivers/usb/gadget/udc/atmel_usba_udc.c | 40
> > ++++++++++++++++-----------------
> > 1 file changed, 19 insertions(+), 21 deletions(-)
> >
> > diff --git a/drivers/usb/gadget/udc/atmel_usba_udc.c
> > b/drivers/usb/gadget/udc/atmel_usba_udc.c
> > index 075eaaa8a408..403e06e7175f 100644
> > --- a/drivers/usb/gadget/udc/atmel_usba_udc.c
> > +++ b/drivers/usb/gadget/udc/atmel_usba_udc.c
> [...]
> > @@ -2284,10 +2284,24 @@ static int usba_udc_probe(struct platform_device
> > *pdev)
> > udc->gadget = usba_gadget_template;
> > INIT_LIST_HEAD(&udc->gadget.ep_list);
> >
> > - regs = platform_get_resource(pdev, IORESOURCE_MEM, CTRL_IOMEM_ID);
> > - fifo = platform_get_resource(pdev, IORESOURCE_MEM, FIFO_IOMEM_ID);
> > - if (!regs || !fifo)
> > - return -ENXIO;
> > + res = platform_get_resource(pdev, IORESOURCE_MEM, CTRL_IOMEM_ID);
> > + udc->regs = devm_ioremap_resource(&pdev->dev, res);
> > + if (IS_ERR(udc->regs)) {
> > + ret = PTR_ERR(udc->regs);
> > + dev_err(&pdev->dev, "Unable to map I/O memory: %d\n", ret);
>
> devm_ioremap_resource() prints out the error message.
It does, indeed. However I left both error messages here to distinguish
between I/O and FIFO failures.
> > + return ret;
> > + }
> > + dev_info(&pdev->dev, "MMIO registers at %pR mapped at %p\n",
> > + res, udc->regs);
> > +
> > + res = platform_get_resource(pdev, IORESOURCE_MEM, FIFO_IOMEM_ID);
> > + udc->fifo = devm_ioremap_resource(&pdev->dev, res);
> > + if (IS_ERR(udc->fifo)) {
> > + ret = PTR_ERR(udc->fifo);
> > + dev_err(&pdev->dev, "Unable to map FIFO: %d\n", ret);
>
> Same comment here.
>
> > + return ret;
> > + }
> > + dev_info(&pdev->dev, "FIFO at %pR mapped at %p\n", res, udc->fifo);
> >
> > irq = platform_get_irq(pdev, 0);
> > if (irq < 0)
> [...]
>
> MBR, Sergei
--
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
