]> Pileus Git - ~andy/linux/commitdiff
net: ethernet: stmicro: stmmac: use devm_ioremap_resource()
authorSilviu-Mihai Popescu <silviupopescu1990@gmail.com>
Thu, 11 Apr 2013 09:52:13 +0000 (09:52 +0000)
committerDavid S. Miller <davem@davemloft.net>
Thu, 11 Apr 2013 20:21:58 +0000 (16:21 -0400)
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>
drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c

index b43d68b40e50f6156ea10ccfad3f0924d04d1b01..1d3780f55ba2c9397641b1b5986b952680259e0c 100644 (file)
@@ -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,