net/mlxbf_gige: Make use of devm_platform_ioremap_resourcexxx()

Use the devm_platform_ioremap_resource_byname() helper instead of
calling platform_get_resource_byname() and devm_ioremap_resource()
separately

Use the devm_platform_ioremap_resource() helper instead of
calling platform_get_resource() and devm_ioremap_resource()
separately

Signed-off-by: Cai Huoqing <caihuoqing@baidu.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/litex/litex_liteeth.c b/drivers/net/ethernet/litex/litex_liteeth.c
index 10e6f2dedfade0bbfbc154ca676f6c0c38b20bc7..a9bdbf0dcfe1ed63819bd9eeb0859ded01bc61b6 100644 (file)
--- a/drivers/net/ethernet/litex/litex_liteeth.c
+++ b/drivers/net/ethernet/litex/litex_liteeth.c
@@ -227,7 +227,6 @@ static int liteeth_probe(struct platform_device *pdev)
 {
        struct net_device *netdev;
        void __iomem *buf_base;
-       struct resource *res;
        struct liteeth *priv;
        int irq, err;
 
@@ -249,13 +248,11 @@ static int liteeth_probe(struct platform_device *pdev)
        }
        netdev->irq = irq;
 
-       res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "mac");
-       priv->base = devm_ioremap_resource(&pdev->dev, res);
+       priv->base = devm_platform_ioremap_resource_byname(pdev, "mac");
        if (IS_ERR(priv->base))
                return PTR_ERR(priv->base);
 
-       res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "buffer");
-       buf_base = devm_ioremap_resource(&pdev->dev, res);
+       buf_base = devm_platform_ioremap_resource_byname(pdev, "buffer");
        if (IS_ERR(buf_base))
                return PTR_ERR(buf_base);
 

diff --git a/drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_main.c b/drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_main.c
index d222196137196fae4036a534ac38d0aad248a5af..3e85b17f5857303d9628f0ca68725d34cca75c11 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_main.c
+++ b/drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_main.c
@@ -269,9 +269,6 @@ static int mlxbf_gige_probe(struct platform_device *pdev)
 {
        struct phy_device *phydev;
        struct net_device *netdev;
-       struct resource *mac_res;
-       struct resource *llu_res;
-       struct resource *plu_res;
        struct mlxbf_gige *priv;
        void __iomem *llu_base;
        void __iomem *plu_base;
@@ -280,27 +277,15 @@ static int mlxbf_gige_probe(struct platform_device *pdev)
        int addr;
        int err;
 
-       mac_res = platform_get_resource(pdev, IORESOURCE_MEM, MLXBF_GIGE_RES_MAC);
-       if (!mac_res)
-               return -ENXIO;
-
-       base = devm_ioremap_resource(&pdev->dev, mac_res);
+       base = devm_platform_ioremap_resource(pdev, MLXBF_GIGE_RES_MAC);
        if (IS_ERR(base))
                return PTR_ERR(base);
 
-       llu_res = platform_get_resource(pdev, IORESOURCE_MEM, MLXBF_GIGE_RES_LLU);
-       if (!llu_res)
-               return -ENXIO;
-
-       llu_base = devm_ioremap_resource(&pdev->dev, llu_res);
+       llu_base = devm_platform_ioremap_resource(pdev, MLXBF_GIGE_RES_LLU);
        if (IS_ERR(llu_base))
                return PTR_ERR(llu_base);
 
-       plu_res = platform_get_resource(pdev, IORESOURCE_MEM, MLXBF_GIGE_RES_PLU);
-       if (!plu_res)
-               return -ENXIO;
-
-       plu_base = devm_ioremap_resource(&pdev->dev, plu_res);
+       plu_base = devm_platform_ioremap_resource(pdev, MLXBF_GIGE_RES_PLU);
        if (IS_ERR(plu_base))
                return PTR_ERR(plu_base);
 

diff --git a/drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_mdio.c b/drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_mdio.c
index e32dd34fdcc024e7c75de6497a6b8a81289f8a4b..7905179a95753dee45c7c338b9fb5e295dd715ec 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_mdio.c
+++ b/drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_mdio.c
@@ -145,14 +145,9 @@ static int mlxbf_gige_mdio_write(struct mii_bus *bus, int phy_add,
 int mlxbf_gige_mdio_probe(struct platform_device *pdev, struct mlxbf_gige *priv)
 {
        struct device *dev = &pdev->dev;
-       struct resource *res;
        int ret;
 
-       res = platform_get_resource(pdev, IORESOURCE_MEM, MLXBF_GIGE_RES_MDIO9);
-       if (!res)
-               return -ENODEV;
-
-       priv->mdio_io = devm_ioremap_resource(dev, res);
+       priv->mdio_io = devm_platform_ioremap_resource(pdev, MLXBF_GIGE_RES_MDIO9);
        if (IS_ERR(priv->mdio_io))
                return PTR_ERR(priv->mdio_io);
 

diff --git a/drivers/net/ethernet/ni/nixge.c b/drivers/net/ethernet/ni/nixge.c
index 36fe2c0f31ffc579ec06167405cb40668f2b7123..346145d3180eb24daca77b036a6dc2d8eea64f4b 100644 (file)
--- a/drivers/net/ethernet/ni/nixge.c
+++ b/drivers/net/ethernet/ni/nixge.c
@@ -1229,7 +1229,6 @@ static int nixge_of_get_resources(struct platform_device *pdev)
 {
        const struct of_device_id *of_id;
        enum nixge_version version;
-       struct resource *ctrlres;
        struct net_device *ndev;
        struct nixge_priv *priv;
 
@@ -1248,13 +1247,10 @@ static int nixge_of_get_resources(struct platform_device *pdev)
                netdev_err(ndev, "failed to map dma regs\n");
                return PTR_ERR(priv->dma_regs);
        }
-       if (version <= NIXGE_V2) {
+       if (version <= NIXGE_V2)
                priv->ctrl_regs = priv->dma_regs + NIXGE_REG_CTRL_OFFSET;
-       } else {
-               ctrlres = platform_get_resource_byname(pdev, IORESOURCE_MEM,
-                                                      "ctrl");
-               priv->ctrl_regs = devm_ioremap_resource(&pdev->dev, ctrlres);
-       }
+       else
+               priv->ctrl_regs = devm_platform_ioremap_resource_byname(pdev, "ctrl");
        if (IS_ERR(priv->ctrl_regs)) {
                netdev_err(ndev, "failed to map ctrl regs\n");
                return PTR_ERR(priv->ctrl_regs);