redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

staging: emxx_udc: Fix build error

Browse source 
devm_request_and_ioremap has been removed since commit c9d53c0f2d
("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>
This commit is contained in:
Sachin Kamat 2014-06-23 11:43:08 +05:30 committed by Greg Kroah-Hartman
parent b0126abf72
commit a790ebc1f0
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
drivers/staging/emxx_udc/emxx_udc.c
View file

@ -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) {