From: Sachin Kamat <sachin.kamat@samsung.com>
Date: Mon, 23 Jun 2014 06:13:08 +0000 (+0530)
Subject: staging: emxx_udc: Fix build error
X-Git-Tag: v3.17-rc1~123^2~1339
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=a790ebc1f0189bf80bdde03b427e7da7fd3c62f7;p=~emulex%2Finfiniband.git

staging: emxx_udc: Fix build error

devm_request_and_ioremap has been removed since commit c9d53c0f2d23
("devres: remove devm_request_and_ioremap()") Use devm_ioremap_resource
instead. While at it, also remove redundant error message as it is now
handled by devm_ioremap_resource. Without this patch we get the following
build error:
drivers/staging/emxx_udc/emxx_udc.c:3370:2: error: implicit declaration of function ‘devm_request_and_ioremap’ [-Werror=implicit-function-declaration]

Signed-off-by: Sachin Kamat <sachin.kamat@samsung.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/staging/emxx_udc/emxx_udc.c b/drivers/staging/emxx_udc/emxx_udc.c
index c92ded8b5b3..ee0094d8cc6 100644
--- a/drivers/staging/emxx_udc/emxx_udc.c
+++ b/drivers/staging/emxx_udc/emxx_udc.c
@@ -34,6 +34,7 @@
 #include <linux/string.h>
 #include <linux/dma-mapping.h>
 #include <linux/workqueue.h>
+#include <linux/device.h>
 
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
@@ -3367,11 +3368,9 @@ static int nbu2ss_drv_probe(struct platform_device *pdev)
 
 	/* require I/O memory and IRQ to be provided as resources */
 	r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-	mmio_base = devm_request_and_ioremap(&pdev->dev, r);
-	if (IS_ERR(mmio_base)) {
-		dev_err(&pdev->dev, "failed to map I/O memory\n");
+	mmio_base = devm_ioremap_resource(&pdev->dev, r);
+	if (IS_ERR(mmio_base))
 		return PTR_ERR(mmio_base);
-	}
 
 	irq = platform_get_irq(pdev, 0);
 	if (irq < 0) {