Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[firefly-linux-kernel-4.4.55.git] / drivers / net / ethernet / stmicro / stmmac / stmmac_platform.c

diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
index b43d68b40e50f6156ea10ccfad3f0924d04d1b01..1d3780f55ba2c9397641b1b5986b952680259e0c 100644 (file)
--- 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,