2013-04-11 19:52:26

by Silviu-Mihai Popescu

Subject: [PATCH] net: ethernet: stmicro: stmmac: use devm_ioremap_resource()

Convert use of devm_request_and_ioremap() to the newly introduced
devm_ioremap_resource() which provides more consistent error handling.

devm_ioremap_resource() provides its own error messages so all explicit
error messages can be removed from the failure code paths.

This was found with coccinelle.

Signed-off-by: Silviu-Mihai Popescu <[email protected]>
---
.../net/ethernet/stmicro/stmmac/stmmac_platform.c | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
index b43d68b..1d3780f 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
@@ -88,11 +88,9 @@ static int stmmac_pltfr_probe(struct platform_device *pdev)
if (!res)
return -ENODEV;

- addr = devm_request_and_ioremap(dev, res);
- if (!addr) {
- pr_err("%s: ERROR: memory mapping failed", __func__);
- return -ENOMEM;
- }
+ addr = devm_ioremap_resource(dev, res);
+ if (IS_ERR(addr))
+ return PTR_ERR(addr);

if (pdev->dev.of_node) {
plat_dat = devm_kzalloc(&pdev->dev,
--
1.7.9.5

2013-04-11 20:23:07

by David Miller

Subject: Re: [PATCH] net: ethernet: stmicro: stmmac: use devm_ioremap_resource()

From: Silviu-Mihai Popescu <[email protected]>
Date: Thu, 11 Apr 2013 22:52:13 +0300

> Convert use of devm_request_and_ioremap() to the newly introduced
> devm_ioremap_resource() which provides more consistent error handling.
>
> devm_ioremap_resource() provides its own error messages so all explicit
> error messages can be removed from the failure code paths.
>
> This was found with coccinelle.
>
> Signed-off-by: Silviu-Mihai Popescu <[email protected]>

Applied.