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

Commit 8852b2f7 authored by Robert Jarzmik's avatar Robert Jarzmik Committed by Linus Walleij
Browse files

gpio: pxa: convert to devm_ioremap 



Use the device managed ioremap to simplify the probe function.

Signed-off-by: default avatarRobert Jarzmik <robert.jarzmik@free.fr>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent fc0589ca

drivers/gpio/gpio-pxa.c

+2 −5
Original line number Diff line number Diff line
@@ -614,9 +614,8 @@ static int pxa_gpio_probe(struct platform_device *pdev) 
		|| (irq_mux <= 0))

		return -EINVAL;

	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	if (!res)

		return -EINVAL;

	gpio_reg_base = ioremap(res->start, resource_size(res));

	gpio_reg_base = devm_ioremap(&pdev->dev, res->start,

				     resource_size(res));

	if (!gpio_reg_base)

		return -EINVAL;
@@ -627,13 +626,11 @@ static int pxa_gpio_probe(struct platform_device *pdev) 
	if (IS_ERR(clk)) {

		dev_err(&pdev->dev, "Error %ld to get gpio clock\n",

			PTR_ERR(clk));

		iounmap(gpio_reg_base);

		return PTR_ERR(clk);

	}

	ret = clk_prepare_enable(clk);

	if (ret) {

		clk_put(clk);

		iounmap(gpio_reg_base);

		return ret;

	}