diff options
author | Tushar Behera <tushar.behera@linaro.org> | 2013-06-10 07:35:03 -0400 |
---|---|---|
committer | Linus Walleij <linus.walleij@linaro.org> | 2013-06-17 04:53:38 -0400 |
commit | 62ffac141e82334ed0065c118b0544e23f3f5243 (patch) | |
tree | 71f83189edf54d6e9123b85e630333d42ba63916 /drivers/gpio | |
parent | 68515bbe76d6d274d8dc2ba3a57260154cef059d (diff) |
gpio-sta2x11: Convert to use devm_ioremap_resource
Commit 75096579c3ac ("lib: devres: Introduce devm_ioremap_resource()")
introduced devm_ioremap_resource() and deprecated the use of
devm_request_and_ioremap().
Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
CC: linux-gpio@vger.kernel.org
CC: Grant Likely <grant.likely@linaro.org>
CC: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/gpio')
-rw-r--r-- | drivers/gpio/gpio-sta2x11.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/gpio/gpio-sta2x11.c b/drivers/gpio/gpio-sta2x11.c index 9b5564564bcd..f43ab6aea281 100644 --- a/drivers/gpio/gpio-sta2x11.c +++ b/drivers/gpio/gpio-sta2x11.c | |||
@@ -374,7 +374,9 @@ static int gsta_probe(struct platform_device *dev) | |||
374 | if (!chip) | 374 | if (!chip) |
375 | return -ENOMEM; | 375 | return -ENOMEM; |
376 | chip->dev = &dev->dev; | 376 | chip->dev = &dev->dev; |
377 | chip->reg_base = devm_request_and_ioremap(&dev->dev, res); | 377 | chip->reg_base = devm_ioremap_resource(&dev->dev, res); |
378 | if (IS_ERR(chip->reg_base)) | ||
379 | return PTR_ERR(chip->reg_base); | ||
378 | 380 | ||
379 | for (i = 0; i < GSTA_NR_BLOCKS; i++) { | 381 | for (i = 0; i < GSTA_NR_BLOCKS; i++) { |
380 | chip->regs[i] = chip->reg_base + i * 4096; | 382 | chip->regs[i] = chip->reg_base + i * 4096; |