| Message ID | 1368458871-7402-1-git-send-email-laurent.navet@gmail.com |
|---|---|
| State | Awaiting Upstream, archived |
| Delegated to: | David Miller |
| Headers | show |
On 2013-05-13 17:27, Laurent Navet wrote: > Replace a call to deprecated devm_request_and_ioremap by devm_ioremap_resource. > dev_err() message is no more needed since it's already displayed in > devm_ioremap_resource(). > > Signed-off-by: Laurent Navet <laurent.navet@gmail.com> > --- > drivers/net/can/grcan.c | 7 +++---- > 1 file changed, 3 insertions(+), 4 deletions(-) > > diff --git a/drivers/net/can/grcan.c b/drivers/net/can/grcan.c > index 17fbc7a..9e9d0d6 100644 > --- a/drivers/net/can/grcan.c > +++ b/drivers/net/can/grcan.c > @@ -1683,10 +1683,9 @@ static int grcan_probe(struct platform_device *ofdev) > } > > res = platform_get_resource(ofdev, IORESOURCE_MEM, 0); > - base = devm_request_and_ioremap(&ofdev->dev, res); > - if (!base) { > - dev_err(&ofdev->dev, "couldn't map IO resource\n"); > - err = -EADDRNOTAVAIL; > + base = devm_ioremap_resource(&ofdev->dev, res); > + if (IS_ERR(base)) { > + err = PTR_ERR(base); > goto exit_error; > } Acked-by: Andreas Larsson <andreas@gaisler.com> -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 05/13/2013 05:27 PM, Laurent Navet wrote: > Replace a call to deprecated devm_request_and_ioremap by devm_ioremap_resource. > dev_err() message is no more needed since it's already displayed in > devm_ioremap_resource(). > > Signed-off-by: Laurent Navet <laurent.navet@gmail.com> Tnx, applied to linux-can-next. Marc
diff --git a/drivers/net/can/grcan.c b/drivers/net/can/grcan.c index 17fbc7a..9e9d0d6 100644 --- a/drivers/net/can/grcan.c +++ b/drivers/net/can/grcan.c @@ -1683,10 +1683,9 @@ static int grcan_probe(struct platform_device *ofdev) } res = platform_get_resource(ofdev, IORESOURCE_MEM, 0); - base = devm_request_and_ioremap(&ofdev->dev, res); - if (!base) { - dev_err(&ofdev->dev, "couldn't map IO resource\n"); - err = -EADDRNOTAVAIL; + base = devm_ioremap_resource(&ofdev->dev, res); + if (IS_ERR(base)) { + err = PTR_ERR(base); goto exit_error; }
Replace a call to deprecated devm_request_and_ioremap by devm_ioremap_resource. dev_err() message is no more needed since it's already displayed in devm_ioremap_resource(). Signed-off-by: Laurent Navet <laurent.navet@gmail.com> --- drivers/net/can/grcan.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)