2014-04-03 00:18:51

by Jingoo Han

Subject: [PATCH] crypto: omap-des - use devm_ioremap_resource()

Use devm_ioremap_resource() because devm_request_and_ioremap() is
obsoleted by devm_ioremap_resource().

Signed-off-by: Jingoo Han <[email protected]>
---
drivers/crypto/omap-des.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/crypto/omap-des.c b/drivers/crypto/omap-des.c
index ec5f131..f5bafd0 100644
--- a/drivers/crypto/omap-des.c
+++ b/drivers/crypto/omap-des.c
@@ -1074,10 +1074,10 @@ static int omap_des_probe(struct platform_device *pdev)
if (err)
goto err_res;

- dd->io_base = devm_request_and_ioremap(dev, res);
- if (!dd->io_base) {
+ dd->io_base = devm_ioremap_resource(dev, res);
+ if (IS_ERR(dd->io_base)) {
dev_err(dev, "can't ioremap\n");
- err = -ENOMEM;
+ err = PTR_ERR(dd->io_base);
goto err_res;
}
dd->phys_base = res->start;
--
1.7.10.4

2014-04-08 04:54:23

by Jingoo Han

Subject: [PATCH V2] crypto: omap-des - use devm_ioremap_resource()

Use devm_ioremap_resource() because devm_request_and_ioremap() is
obsoleted by devm_ioremap_resource().

Signed-off-by: Jingoo Han <[email protected]>
---
Changes since v1:
- remove unnecessary error message, because devm_ioremap_resource()
already prints one in all failure cases.

drivers/crypto/omap-des.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/drivers/crypto/omap-des.c b/drivers/crypto/omap-des.c
index ec5f131..4a13624 100644
--- a/drivers/crypto/omap-des.c
+++ b/drivers/crypto/omap-des.c
@@ -1074,10 +1074,9 @@ static int omap_des_probe(struct platform_device *pdev)
if (err)
goto err_res;

- dd->io_base = devm_request_and_ioremap(dev, res);
- if (!dd->io_base) {
- dev_err(dev, "can't ioremap\n");
- err = -ENOMEM;
+ dd->io_base = devm_ioremap_resource(dev, res);
+ if (IS_ERR(dd->io_base)) {
+ err = PTR_ERR(dd->io_base);
goto err_res;
}
dd->phys_base = res->start;
--
1.7.10.4

2014-04-09 15:35:44

by Joel Fernandes

Subject: Re: [PATCH V2] crypto: omap-des - use devm_ioremap_resource()

On 04/07/2014 11:54 PM, Jingoo Han wrote:
> Use devm_ioremap_resource() because devm_request_and_ioremap() is
> obsoleted by devm_ioremap_resource().
>
> Signed-off-by: Jingoo Han <[email protected]>
> ---
> Changes since v1:
> - remove unnecessary error message, because devm_ioremap_resource()
> already prints one in all failure cases.
>
> drivers/crypto/omap-des.c | 7 +++----
> 1 file changed, 3 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/crypto/omap-des.c b/drivers/crypto/omap-des.c
> index ec5f131..4a13624 100644
> --- a/drivers/crypto/omap-des.c
> +++ b/drivers/crypto/omap-des.c
> @@ -1074,10 +1074,9 @@ static int omap_des_probe(struct platform_device *pdev)
> if (err)
> goto err_res;
>
> - dd->io_base = devm_request_and_ioremap(dev, res);
> - if (!dd->io_base) {
> - dev_err(dev, "can't ioremap\n");
> - err = -ENOMEM;
> + dd->io_base = devm_ioremap_resource(dev, res);
> + if (IS_ERR(dd->io_base)) {
> + err = PTR_ERR(dd->io_base);
> goto err_res;
> }
> dd->phys_base = res->start;
>


Acked-by: Joel Fernandes <[email protected]>

Thanks,

-Joel

2014-04-09 17:46:39

by Marek Vasut

Subject: Re: [PATCH V2] crypto: omap-des - use devm_ioremap_resource()

On Tuesday, April 08, 2014 at 06:54:22 AM, Jingoo Han wrote:
> Use devm_ioremap_resource() because devm_request_and_ioremap() is
> obsoleted by devm_ioremap_resource().
>
> Signed-off-by: Jingoo Han <[email protected]>

Reviewed-by: Marek Vasut <[email protected]>

Best regards,
Marek Vasut

2014-04-10 15:55:43

by Joel Fernandes

Subject: Re: [PATCH V2] crypto: omap-des - use devm_ioremap_resource()

On 04/07/2014 11:54 PM, Jingoo Han wrote:
> Use devm_ioremap_resource() because devm_request_and_ioremap() is
> obsoleted by devm_ioremap_resource().
>
> Signed-off-by: Jingoo Han <[email protected]>

Acked-by: Joel Fernandes <[email protected]>

2014-04-16 13:48:33

by Herbert Xu

Subject: Re: [PATCH V2] crypto: omap-des - use devm_ioremap_resource()

On Thu, Apr 10, 2014 at 10:55:34AM -0500, Joel Fernandes wrote:
> On 04/07/2014 11:54 PM, Jingoo Han wrote:
> > Use devm_ioremap_resource() because devm_request_and_ioremap() is
> > obsoleted by devm_ioremap_resource().
> >
> > Signed-off-by: Jingoo Han <[email protected]>
>
> Acked-by: Joel Fernandes <[email protected]>

Patch applied.
--
Email: Herbert Xu <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt