aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pinctrl/pinctrl-bcm2835.c
diff options
context:
space:
mode:
authorThierry Reding <thierry.reding@avionic-design.de>2013-01-21 05:09:14 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-01-22 14:41:57 -0500
commit9e0c1fb29a7c257a31c321c2437617b6b4d66168 (patch)
treeee0b93ff33eb3156339a1e72411c8bbad0c8c415 /drivers/pinctrl/pinctrl-bcm2835.c
parent1684789f86cbd6a1aff82970992c711898b19995 (diff)
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: Thierry Reding <thierry.reding@avionic-design.de> Cc: Linus Walleij <linus.walleij@linaro.org> Acked-by: Viresh Kumar <viresh.kumar@linaro.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/pinctrl/pinctrl-bcm2835.c')
-rw-r--r--drivers/pinctrl/pinctrl-bcm2835.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/pinctrl/pinctrl-bcm2835.c b/drivers/pinctrl/pinctrl-bcm2835.c
index d347b9f2eae3..4eb6d2c4e4df 100644
--- a/drivers/pinctrl/pinctrl-bcm2835.c
+++ b/drivers/pinctrl/pinctrl-bcm2835.c
@@ -959,9 +959,9 @@ static int bcm2835_pinctrl_probe(struct platform_device *pdev)
959 return err; 959 return err;
960 } 960 }
961 961
962 pc->base = devm_request_and_ioremap(dev, &iomem); 962 pc->base = devm_ioremap_resource(dev, &iomem);
963 if (!pc->base) 963 if (IS_ERR(pc->base))
964 return -EADDRNOTAVAIL; 964 return PTR_ERR(pc->base);
965 965
966 pc->gpio_chip = bcm2835_gpio_chip; 966 pc->gpio_chip = bcm2835_gpio_chip;
967 pc->gpio_chip.dev = dev; 967 pc->gpio_chip.dev = dev;