* [1/2] usb: gadget: udc: atmel: Use devm_ioremap_resource()
@ 2018-01-22 15:34 Sergei Shtylyov
0 siblings, 0 replies; 5+ messages in thread
From: Sergei Shtylyov @ 2018-01-22 15:34 UTC (permalink / raw)
To: Ladislav Michl, linux-usb; +Cc: Nicolas Ferre, Alexandre Belloni
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 <ladis@linux-mips.org>
> ---
> 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.
> + 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 majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 5+ messages in thread
* [1/2] usb: gadget: udc: atmel: Use devm_ioremap_resource()
@ 2018-01-22 15:57 Ladislav Michl
0 siblings, 0 replies; 5+ messages in thread
From: Ladislav Michl @ 2018-01-22 15:57 UTC (permalink / raw)
To: Sergei Shtylyov; +Cc: linux-usb, Nicolas Ferre, Alexandre Belloni
On Mon, Jan 22, 2018 at 06:53:38PM +0300, Sergei Shtylyov wrote:
> On 01/22/2018 06:44 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 <ladis@linux-mips.org>
> >>> ---
> >>> 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.
>
> Well, I'm seeing the successfully remapped resource being dumped below, so you can judge the probing progress by that message (and the resource dump done by devm_ioremap_resource())... but if you feel that not enough, OK, leave it as is...
I feel convinced and v2 will follow :-)
---
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
^ permalink raw reply [flat|nested] 5+ messages in thread
* [1/2] usb: gadget: udc: atmel: Use devm_ioremap_resource()
@ 2018-01-22 15:53 Sergei Shtylyov
0 siblings, 0 replies; 5+ messages in thread
From: Sergei Shtylyov @ 2018-01-22 15:53 UTC (permalink / raw)
To: Ladislav Michl; +Cc: linux-usb, Nicolas Ferre, Alexandre Belloni
On 01/22/2018 06:44 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 <ladis@linux-mips.org>
>>> ---
>>> 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.
Well, I'm seeing the successfully remapped resource being dumped below, so you can judge the probing progress by that message (and the resource dump done by devm_ioremap_resource())... but if you feel that not enough, OK, leave it as is...
>>> + 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 majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 5+ messages in thread
* [1/2] usb: gadget: udc: atmel: Use devm_ioremap_resource()
@ 2018-01-22 15:44 Ladislav Michl
0 siblings, 0 replies; 5+ messages in thread
From: Ladislav Michl @ 2018-01-22 15:44 UTC (permalink / raw)
To: Sergei Shtylyov; +Cc: linux-usb, Nicolas Ferre, Alexandre Belloni
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 <ladis@linux-mips.org>
> > ---
> > 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 majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 5+ messages in thread
* [1/2] usb: gadget: udc: atmel: Use devm_ioremap_resource()
@ 2018-01-22 15:21 Ladislav Michl
0 siblings, 0 replies; 5+ messages in thread
From: Ladislav Michl @ 2018-01-22 15:21 UTC (permalink / raw)
To: linux-usb; +Cc: Nicolas Ferre, Alexandre Belloni
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 <ladis@linux-mips.org>
---
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
@@ -2272,7 +2272,7 @@ static struct usba_ep * usba_udc_pdata(struct platform_device *pdev,
static int usba_udc_probe(struct platform_device *pdev)
{
- struct resource *regs, *fifo;
+ struct resource *res;
struct clk *pclk, *hclk;
struct usba_udc *udc;
int irq, ret, i;
@@ -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);
+ 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);
+ 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)
@@ -2307,22 +2321,6 @@ static int usba_udc_probe(struct platform_device *pdev)
udc->hclk = hclk;
udc->vbus_pin = -ENODEV;
- ret = -ENOMEM;
- udc->regs = devm_ioremap(&pdev->dev, regs->start, resource_size(regs));
- if (!udc->regs) {
- dev_err(&pdev->dev, "Unable to map I/O memory, aborting.\n");
- return ret;
- }
- dev_info(&pdev->dev, "MMIO registers at 0x%08lx mapped at %p\n",
- (unsigned long)regs->start, udc->regs);
- udc->fifo = devm_ioremap(&pdev->dev, fifo->start, resource_size(fifo));
- if (!udc->fifo) {
- dev_err(&pdev->dev, "Unable to map FIFO, aborting.\n");
- return ret;
- }
- dev_info(&pdev->dev, "FIFO at 0x%08lx mapped at %p\n",
- (unsigned long)fifo->start, udc->fifo);
-
platform_set_drvdata(pdev, udc);
/* Make sure we start from a clean slate */
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2018-01-22 15:57 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-01-22 15:34 [1/2] usb: gadget: udc: atmel: Use devm_ioremap_resource() Sergei Shtylyov
-- strict thread matches above, loose matches on Subject: below --
2018-01-22 15:57 Ladislav Michl
2018-01-22 15:53 Sergei Shtylyov
2018-01-22 15:44 Ladislav Michl
2018-01-22 15:21 Ladislav Michl
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.