Merge remote-tracking branch 'omap/for-next'

[deliverable/linux.git] / drivers / net / phy / mdio-xgene.c

diff --git a/drivers/net/phy/mdio-xgene.c b/drivers/net/phy/mdio-xgene.c
index d94a978024d942c6fe620d455036075c0f2b153c..775674808249eb56fa0eb4087745b930b0bef411 100644 (file)
--- a/drivers/net/phy/mdio-xgene.c
+++ b/drivers/net/phy/mdio-xgene.c
@@ -345,10 +345,8 @@ static int xgene_mdio_probe(struct platform_device *pdev)
 
        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
        csr_base = devm_ioremap_resource(dev, res);
-       if (IS_ERR(csr_base)) {
-               dev_err(dev, "Unable to retrieve mac CSR region\n");
+       if (IS_ERR(csr_base))
                return PTR_ERR(csr_base);
-       }
        pdata->mac_csr_addr = csr_base;
        pdata->mdio_csr_addr = csr_base + BLOCK_XG_MDIO_CSR_OFFSET;
        pdata->diag_csr_addr = csr_base + BLOCK_DIAG_CSR_OFFSET;