diff options
| author | Tushar Behera <tushar.behera@linaro.org> | 2013-06-10 13:35:03 +0200 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2013-06-17 10:53:38 +0200 |
| commit | 62ffac141e82334ed0065c118b0544e23f3f5243 (patch) | |
| tree | 71f83189edf54d6e9123b85e630333d42ba63916 /drivers/gpio/gpio-sta2x11.c | |
| parent | gpio_msm: Convert to use devm_ioremap_resource (diff) | |
| download | linux-62ffac141e82334ed0065c118b0544e23f3f5243.tar.xz linux-62ffac141e82334ed0065c118b0544e23f3f5243.zip | |
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 '')
| -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) if (!chip) return -ENOMEM; chip->dev = &dev->dev; - chip->reg_base = devm_request_and_ioremap(&dev->dev, res); + chip->reg_base = devm_ioremap_resource(&dev->dev, res); + if (IS_ERR(chip->reg_base)) + return PTR_ERR(chip->reg_base); for (i = 0; i < GSTA_NR_BLOCKS; i++) { chip->regs[i] = chip->reg_base + i * 4096; |