usb: gadget: udc: atmel: Use devm_ioremap_resource()

Quoted 30 lines · Ladislav Michl

Quoted 29 lines

Quoted 13 lines

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(-)

drivers/usb/gadget/udc/atmel_usba_udc.c +0 -0

index 075eaaa8a408..403e06e7175f 100644

[...]

drivers/usb/gadget/udc/atmel_usba_udc.c static int usba_udc_probe(struct platform_device *pdev) · line 2291

Quoted 13 lines

drivers/usb/gadget/udc/atmel_usba_udc.c +5 -4

@@ -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.

Quoted 2 lines

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...