Skip to contentSkip to conversation

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

PATCH Superseded Ladislav Michl 1 participant 1 message Jan 22, 2018 USB

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 usb: gadget: udc: atmel: Use devm_ioremap_resource()

Hello Sergei,

Quoted 22 lines · Sergei Shtylyov

Hello!

Quoted 13 lines · Ladislav Michl

As devm_ioremap_resource() checks for valid resource, make use of it instead of testing ourselves. As a bonus memory region is requested.

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

[...]

Quoted 4 lines
drivers/usb/gadget/udc/atmel_usba_udc.c +0 -0
@@ -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);
 
Quoted 11 lines

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

Quoted 9 lines
drivers/usb/gadget/udc/atmel_usba_udc.c +5 -4
-	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.

Quoted 17 lines

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

Quoted 10 lines
drivers/usb/gadget/udc/atmel_usba_udc.c +10 -0
+		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.

Quoted 4 lines
drivers/usb/gadget/udc/atmel_usba_udc.c +3 -0
+		return ret;
+	}
+	dev_info(&pdev->dev, "FIFO at %pR mapped at %p\n", res, udc->fifo);
 
Quoted 5 lines

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

Quoted 2 lines
drivers/usb/gadget/udc/atmel_usba_udc.c +0 -0
 	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