Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 148e1134 authored by Thierry Reding's avatar Thierry Reding Committed by Greg Kroah-Hartman
Browse files

usb: Convert to devm_ioremap_resource() 



Convert all uses of devm_request_and_ioremap() to the newly introduced
devm_ioremap_resource() which provides more consistent error handling.

devm_ioremap_resource() provides its own error messages so all explicit
error messages can be removed from the failure code paths.

Signed-off-by: default avatarThierry Reding <thierry.reding@avionic-design.de>
Acked-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Acked-by: default avatarFelipe Balbi <balbi@ti.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent eb612fa0

drivers/usb/chipidea/usbmisc_imx6q.c

+3 −3
Original line number Diff line number Diff line
@@ -98,9 +98,9 @@ static int usbmisc_imx6q_probe(struct platform_device *pdev) 
	spin_lock_init(&data->lock);



	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	data->base = devm_request_and_ioremap(&pdev->dev, res);

	if (!data->base)

		return -EADDRNOTAVAIL;

	data->base = devm_ioremap_resource(&pdev->dev, res);

	if (IS_ERR(data->base))

		return PTR_ERR(data->base);



	data->clk = devm_clk_get(&pdev->dev, NULL);

	if (IS_ERR(data->clk)) {

drivers/usb/gadget/bcm63xx_udc.c

+7 −6
Original line number Diff line number Diff line
@@ -2351,19 +2351,20 @@ static int bcm63xx_udc_probe(struct platform_device *pdev) 
		dev_err(dev, "error finding USBD resource\n");

		return -ENXIO;

	}

	udc->usbd_regs = devm_request_and_ioremap(dev, res);



	udc->usbd_regs = devm_ioremap_resource(dev, res);

	if (IS_ERR(udc->usbd_regs))

		return PTR_ERR(udc->usbd_regs);



	res = platform_get_resource(pdev, IORESOURCE_MEM, 1);

	if (!res) {

		dev_err(dev, "error finding IUDMA resource\n");

		return -ENXIO;

	}

	udc->iudma_regs = devm_request_and_ioremap(dev, res);



	if (!udc->usbd_regs || !udc->iudma_regs) {

		dev_err(dev, "error requesting resources\n");

		return -ENXIO;

	}

	udc->iudma_regs = devm_ioremap_resource(dev, res);

	if (IS_ERR(udc->iudma_regs))

		return PTR_ERR(udc->iudma_regs);



	spin_lock_init(&udc->lock);

	INIT_WORK(&udc->ep0_wq, bcm63xx_ep0_process);

drivers/usb/gadget/s3c-hsotg.c

+3 −4
Original line number Diff line number Diff line
@@ -3525,10 +3525,9 @@ static int s3c_hsotg_probe(struct platform_device *pdev) 


	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);



	hsotg->regs = devm_request_and_ioremap(&pdev->dev, res);

	if (!hsotg->regs) {

		dev_err(dev, "cannot map registers\n");

		ret = -ENXIO;

	hsotg->regs = devm_ioremap_resource(&pdev->dev, res);

	if (IS_ERR(hsotg->regs)) {

		ret = PTR_ERR(hsotg->regs);

		goto err_clk;

	}

drivers/usb/gadget/s3c-hsudc.c

+3 −4
Original line number Diff line number Diff line
@@ -1295,10 +1295,9 @@ static int s3c_hsudc_probe(struct platform_device *pdev) 


	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);



	hsudc->regs = devm_request_and_ioremap(&pdev->dev, res);

	if (!hsudc->regs) {

		dev_err(dev, "error mapping device register area\n");

		ret = -EBUSY;

	hsudc->regs = devm_ioremap_resource(&pdev->dev, res);

	if (IS_ERR(hsudc->regs)) {

		ret = PTR_ERR(hsudc->regs);

		goto err_res;

	}

drivers/usb/host/ehci-atmel.c

+3 −4
Original line number Diff line number Diff line
@@ -143,10 +143,9 @@ static int ehci_atmel_drv_probe(struct platform_device *pdev) 
	hcd->rsrc_start = res->start;

	hcd->rsrc_len = resource_size(res);



	hcd->regs = devm_request_and_ioremap(&pdev->dev, res);

	if (hcd->regs == NULL) {

		dev_dbg(&pdev->dev, "error mapping memory\n");

		retval = -EFAULT;

	hcd->regs = devm_ioremap_resource(&pdev->dev, res);

	if (IS_ERR(hcd->regs)) {

		retval = PTR_ERR(hcd->regs);

		goto fail_request_resource;

	}