| Message ID | 1370864113-17895-5-git-send-email-tushar.behera@linaro.org |
|---|---|
| State | Accepted |
| Commit | 68515bbe76d6d274d8dc2ba3a57260154cef059d |
| 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: Linus Walleij <linus.walleij@linaro.org> > CC: Grant Likely <grant.likely@linaro.org> > --- > drivers/gpio/gpio-msm-v1.c | 12 ++++++------ > 1 file changed, 6 insertions(+), 6 deletions(-) > > diff --git a/drivers/gpio/gpio-msm-v1.c b/drivers/gpio/gpio-msm-v1.c > index c798585a..c0ead43 100644 > --- a/drivers/gpio/gpio-msm-v1.c > +++ b/drivers/gpio/gpio-msm-v1.c > @@ -652,14 +652,14 @@ static int __devinit gpio_msm_v1_probe(struct platform_device *pdev) > return irq2; > > res = platform_get_resource(pdev, IORESOURCE_MEM, 0); > - base1 = devm_request_and_ioremap(&pdev->dev, res); > - if (!base1) > - return -EADDRNOTAVAIL; > + base1 = devm_ioremap_resource(&pdev->dev, res); > + if (IS_ERR(base1)) > + return PTR_ERR(base1); > > res = platform_get_resource(pdev, IORESOURCE_MEM, 1); > - base2 = devm_request_and_ioremap(&pdev->dev, res); > - if (!base2) > - return -EADDRNOTAVAIL; > + base2 = devm_ioremap_resource(&pdev->dev, res); > + if (IS_ERR(base2)) > + return PTR_ERR(base2); > > for (i = FIRST_GPIO_IRQ; i < FIRST_GPIO_IRQ + NR_GPIO_IRQS; i++) { > if (i - FIRST_GPIO_IRQ >= > Ping.
diff --git a/drivers/gpio/gpio-msm-v1.c b/drivers/gpio/gpio-msm-v1.c index c798585a..c0ead43 100644 --- a/drivers/gpio/gpio-msm-v1.c +++ b/drivers/gpio/gpio-msm-v1.c @@ -652,14 +652,14 @@ static int __devinit gpio_msm_v1_probe(struct platform_device *pdev) return irq2; res = platform_get_resource(pdev, IORESOURCE_MEM, 0); - base1 = devm_request_and_ioremap(&pdev->dev, res); - if (!base1) - return -EADDRNOTAVAIL; + base1 = devm_ioremap_resource(&pdev->dev, res); + if (IS_ERR(base1)) + return PTR_ERR(base1); res = platform_get_resource(pdev, IORESOURCE_MEM, 1); - base2 = devm_request_and_ioremap(&pdev->dev, res); - if (!base2) - return -EADDRNOTAVAIL; + base2 = devm_ioremap_resource(&pdev->dev, res); + if (IS_ERR(base2)) + return PTR_ERR(base2); for (i = FIRST_GPIO_IRQ; i < FIRST_GPIO_IRQ + NR_GPIO_IRQS; i++) { if (i - FIRST_GPIO_IRQ >=
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: Linus Walleij <linus.walleij@linaro.org> CC: Grant Likely <grant.likely@linaro.org> --- drivers/gpio/gpio-msm-v1.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)