diff options
| author | Sachin Kamat <sachin.kamat@samsung.com> | 2014-06-23 06:13:08 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-06-27 00:59:02 (GMT) |
| commit | a790ebc1f0189bf80bdde03b427e7da7fd3c62f7 (patch) | |
| tree | 82cbc3b2b3ee5b242f1592e5af52796b7f07e93d /drivers/staging/emxx_udc | |
| parent | b0126abf7248fa21758e0a25eaf93b16435b55c1 (diff) | |
| download | linux-a790ebc1f0189bf80bdde03b427e7da7fd3c62f7.tar.xz | |
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>
Diffstat (limited to 'drivers/staging/emxx_udc')
| -rw-r--r-- | drivers/staging/emxx_udc/emxx_udc.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/staging/emxx_udc/emxx_udc.c b/drivers/staging/emxx_udc/emxx_udc.c index c92ded8..ee0094d 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) { |