diff options
| author | Silviu-Mihai Popescu <silviupopescu1990@gmail.com> | 2013-04-11 09:52:13 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-04-11 16:21:58 -0400 |
| commit | 5760f427ce98fc5576cd4fc7ceadd7ffd9b5feb9 (patch) | |
| tree | c61607ff8a7b90681bcdd3beccfe9c1a4a10fa66 | |
| parent | f9725c039720c3b64a274dbbbd22868b4a274cd2 (diff) | |
| download | linux-5760f427ce98fc5576cd4fc7ceadd7ffd9b5feb9.tar.bz2 | |
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 <silviupopescu1990@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c | 8 |
1 files 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 b43d68b40e50..1d3780f55ba2 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, |