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

Commit 68515bbe authored by Tushar Behera's avatar Tushar Behera Committed by Linus Walleij
Browse files

gpio_msm: Convert to use devm_ioremap_resource 



Commit 75096579 ("lib: devres: Introduce devm_ioremap_resource()")
introduced devm_ioremap_resource() and deprecated the use of
devm_request_and_ioremap().

Signed-off-by: default avatarTushar Behera <tushar.behera@linaro.org>
CC: linux-gpio@vger.kernel.org
CC: Linus Walleij <linus.walleij@linaro.org>
CC: Grant Likely <grant.likely@linaro.org>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent ae9550f6

drivers/gpio/gpio-msm-v1.c

+6 −6
Original line number Diff line number Diff line
@@ -652,14 +652,14 @@ static int gpio_msm_v1_probe(struct platform_device *pdev) 
		return irq2;



	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

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

	if (!base1)

		return -EADDRNOTAVAIL;

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

	if (IS_ERR(base1))

		return PTR_ERR(base1);



	res = platform_get_resource(pdev, IORESOURCE_MEM, 1);

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

	if (!base2)

		return -EADDRNOTAVAIL;

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

	if (IS_ERR(base2))

		return PTR_ERR(base2);



	for (i = FIRST_GPIO_IRQ; i < FIRST_GPIO_IRQ + NR_GPIO_IRQS; i++) {

		if (i - FIRST_GPIO_IRQ >=