| Message ID | 1370864113-17895-6-git-send-email-tushar.behera@linaro.org |
|---|---|
| State | Accepted |
| Commit | 62ffac141e82334ed0065c118b0544e23f3f5243 |
| Headers | show |
On 06/10/2013 05:05 PM, Tushar Behera wrote: > 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> > --- > drivers/gpio/gpio-sta2x11.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpio/gpio-sta2x11.c b/drivers/gpio/gpio-sta2x11.c > index 5585425..c977c14 100644 > --- a/drivers/gpio/gpio-sta2x11.c > +++ b/drivers/gpio/gpio-sta2x11.c > @@ -372,7 +372,9 @@ static int gsta_probe(struct platform_device *dev) > > chip = devm_kzalloc(&dev->dev, sizeof(*chip), GFP_KERNEL); > 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; > Ping.
On Mon, Jun 10, 2013 at 1:35 PM, Tushar Behera <tushar.behera@linaro.org> wrote: > 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> Patch applied. Yours, Linus Walleij
diff --git a/drivers/gpio/gpio-sta2x11.c b/drivers/gpio/gpio-sta2x11.c index 5585425..c977c14 100644 --- a/drivers/gpio/gpio-sta2x11.c +++ b/drivers/gpio/gpio-sta2x11.c @@ -372,7 +372,9 @@ static int gsta_probe(struct platform_device *dev) chip = devm_kzalloc(&dev->dev, sizeof(*chip), GFP_KERNEL); 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;
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> --- drivers/gpio/gpio-sta2x11.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)