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

Commit a790ebc1 authored by Sachin Kamat's avatar Sachin Kamat Committed by Greg Kroah-Hartman
Browse files

staging: emxx_udc: Fix build error 



devm_request_and_ioremap has been removed since commit c9d53c0f
("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: default avatarSachin Kamat <sachin.kamat@samsung.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b0126abf

drivers/staging/emxx_udc/emxx_udc.c

+3 −4
Original line number Diff line number Diff line
@@ -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) {