| Message ID | 1370864113-17895-4-git-send-email-tushar.behera@linaro.org |
|---|---|
| State | Accepted |
| Commit | e02d2930040f993922e9c4449e3d90c8040cfedc |
| 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-mmc@vger.kernel.org > CC: Chris Ball <cjb@laptop.org> > --- > drivers/mmc/host/mvsdio.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/drivers/mmc/host/mvsdio.c b/drivers/mmc/host/mvsdio.c > index d08fe6a..656f1f5 100644 > --- a/drivers/mmc/host/mvsdio.c > +++ b/drivers/mmc/host/mvsdio.c > @@ -758,9 +758,9 @@ static int __init mvsd_probe(struct platform_device *pdev) > > spin_lock_init(&host->lock); > > - host->base = devm_request_and_ioremap(&pdev->dev, r); > - if (!host->base) { > - ret = -ENOMEM; > + host->base = devm_ioremap_resource(&pdev->dev, r); > + if (IS_ERR(host->base)) { > + ret = PTR_ERR(host->base); > goto out; > } > > Ping.
diff --git a/drivers/mmc/host/mvsdio.c b/drivers/mmc/host/mvsdio.c index d08fe6a..656f1f5 100644 --- a/drivers/mmc/host/mvsdio.c +++ b/drivers/mmc/host/mvsdio.c @@ -758,9 +758,9 @@ static int __init mvsd_probe(struct platform_device *pdev) spin_lock_init(&host->lock); - host->base = devm_request_and_ioremap(&pdev->dev, r); - if (!host->base) { - ret = -ENOMEM; + host->base = devm_ioremap_resource(&pdev->dev, r); + if (IS_ERR(host->base)) { + ret = PTR_ERR(host->base); goto out; }
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-mmc@vger.kernel.org CC: Chris Ball <cjb@laptop.org> --- drivers/mmc/host/mvsdio.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)