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

Commit 9e0c1fb2 authored by Thierry Reding's avatar Thierry Reding Committed by Greg Kroah-Hartman
Browse files

pinctrl: Convert to devm_ioremap_resource() 



Convert all uses of devm_request_and_ioremap() to the newly introduced
devm_ioremap_resource() which provides more consistent error handling.

devm_ioremap_resource() provides its own error messages so all explicit
error messages can be removed from the failure code paths.

Signed-off-by: default avatarThierry Reding <thierry.reding@avionic-design.de>
Cc: Linus Walleij <linus.walleij@linaro.org>
Acked-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 1684789f

drivers/pinctrl/pinctrl-at91.c

+3 −4
Original line number Diff line number Diff line
@@ -1503,10 +1503,9 @@ static int at91_gpio_probe(struct platform_device *pdev) 
		goto err;

	}



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

	if (!at91_chip->regbase) {

		dev_err(&pdev->dev, "failed to map registers, ignoring.\n");

		ret = -EBUSY;

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

	if (IS_ERR(at91_chip->regbase)) {

		ret = PTR_ERR(at91_chip->regbase);

		goto err;

	}

drivers/pinctrl/pinctrl-bcm2835.c

+3 −3
Original line number Diff line number Diff line
@@ -959,9 +959,9 @@ static int bcm2835_pinctrl_probe(struct platform_device *pdev) 
		return err;

	}



	pc->base = devm_request_and_ioremap(dev, &iomem);

	if (!pc->base)

		return -EADDRNOTAVAIL;

	pc->base = devm_ioremap_resource(dev, &iomem);

	if (IS_ERR(pc->base))

		return PTR_ERR(pc->base);



	pc->gpio_chip = bcm2835_gpio_chip;

	pc->gpio_chip.dev = dev;

drivers/pinctrl/pinctrl-coh901.c

+3 −5
Original line number Diff line number Diff line
@@ -715,11 +715,9 @@ static int __init u300_gpio_probe(struct platform_device *pdev) 
		return -ENODEV;

	}



	gpio->base = devm_request_and_ioremap(&pdev->dev, memres);

	if (!gpio->base) {

		dev_err(gpio->dev, "could not get remap memory\n");

		return -ENOMEM;

	}

	gpio->base = devm_ioremap_resource(&pdev->dev, memres);

	if (IS_ERR(gpio->base))

		return PTR_ERR(gpio->base);



	gpio->clk = devm_clk_get(gpio->dev, NULL);

	if (IS_ERR(gpio->clk)) {

drivers/pinctrl/pinctrl-exynos5440.c

+3 −5
Original line number Diff line number Diff line
@@ -866,11 +866,9 @@ static int exynos5440_pinctrl_probe(struct platform_device *pdev) 
		return -ENOENT;

	}



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

	if (!priv->reg_base) {

		dev_err(dev, "ioremap failed\n");

		return -ENODEV;

	}

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

	if (IS_ERR(priv->reg_base))

		return PTR_ERR(priv->reg_base);



	ret = exynos5440_gpiolib_register(pdev, priv);

	if (ret)

drivers/pinctrl/pinctrl-falcon.c

+5 −8
Original line number Diff line number Diff line
@@ -411,14 +411,11 @@ static int pinctrl_falcon_probe(struct platform_device *pdev) 
			dev_err(&ppdev->dev, "failed to get clock\n");

			return PTR_ERR(falcon_info.clk[*bank]);

		}

		falcon_info.membase[*bank] =

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

		if (!falcon_info.membase[*bank]) {

			dev_err(&pdev->dev,

				"Failed to remap memory for bank %d\n",

				*bank);

			return -ENOMEM;

		}

		falcon_info.membase[*bank] = devm_ioremap_resource(&pdev->dev,

								   &res);

		if (IS_ERR(falcon_info.membase[*bank]))

			return PTR_ERR(falcon_info.membase[*bank]);

		

		avail = pad_r32(falcon_info.membase[*bank],

					LTQ_PADC_AVAIL);

		pins = fls(avail);