amd-xgbe: use devm_platform_ioremap_resource() to simplify code
authorYueHaibing <yuehaibing@huawei.com>
Wed, 21 Aug 2019 12:32:03 +0000 (20:32 +0800)
committerDavid S. Miller <davem@davemloft.net>
Wed, 21 Aug 2019 20:42:12 +0000 (13:42 -0700)
Use devm_platform_ioremap_resource() to simplify the code a bit.
This is detected by coccinelle.

Reported-by: Hulk Robot <hulkci@huawei.com>
Signed-off-by: YueHaibing <yuehaibing@huawei.com>
Acked-by: Tom Lendacky <thomas.lendacky@amd.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/amd/xgbe/xgbe-platform.c

index dce9e59e888143d5d63be588a4fc7639d93c8e78..4ebd2410185a9544b515ce1192ca93836427f21f 100644 (file)
@@ -301,7 +301,6 @@ static int xgbe_platform_probe(struct platform_device *pdev)
        struct xgbe_prv_data *pdata;
        struct device *dev = &pdev->dev;
        struct platform_device *phy_pdev;
-       struct resource *res;
        const char *phy_mode;
        unsigned int phy_memnum, phy_irqnum;
        unsigned int dma_irqnum, dma_irqend;
@@ -353,8 +352,7 @@ static int xgbe_platform_probe(struct platform_device *pdev)
        }
 
        /* Obtain the mmio areas for the device */
-       res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-       pdata->xgmac_regs = devm_ioremap_resource(dev, res);
+       pdata->xgmac_regs = devm_platform_ioremap_resource(pdev, 0);
        if (IS_ERR(pdata->xgmac_regs)) {
                dev_err(dev, "xgmac ioremap failed\n");
                ret = PTR_ERR(pdata->xgmac_regs);
@@ -363,8 +361,7 @@ static int xgbe_platform_probe(struct platform_device *pdev)
        if (netif_msg_probe(pdata))
                dev_dbg(dev, "xgmac_regs = %p\n", pdata->xgmac_regs);
 
-       res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
-       pdata->xpcs_regs = devm_ioremap_resource(dev, res);
+       pdata->xpcs_regs = devm_platform_ioremap_resource(pdev, 1);
        if (IS_ERR(pdata->xpcs_regs)) {
                dev_err(dev, "xpcs ioremap failed\n");
                ret = PTR_ERR(pdata->xpcs_regs);
@@ -373,8 +370,8 @@ static int xgbe_platform_probe(struct platform_device *pdev)
        if (netif_msg_probe(pdata))
                dev_dbg(dev, "xpcs_regs  = %p\n", pdata->xpcs_regs);
 
-       res = platform_get_resource(phy_pdev, IORESOURCE_MEM, phy_memnum++);
-       pdata->rxtx_regs = devm_ioremap_resource(dev, res);
+       pdata->rxtx_regs = devm_platform_ioremap_resource(phy_pdev,
+                                                         phy_memnum++);
        if (IS_ERR(pdata->rxtx_regs)) {
                dev_err(dev, "rxtx ioremap failed\n");
                ret = PTR_ERR(pdata->rxtx_regs);
@@ -383,8 +380,8 @@ static int xgbe_platform_probe(struct platform_device *pdev)
        if (netif_msg_probe(pdata))
                dev_dbg(dev, "rxtx_regs  = %p\n", pdata->rxtx_regs);
 
-       res = platform_get_resource(phy_pdev, IORESOURCE_MEM, phy_memnum++);
-       pdata->sir0_regs = devm_ioremap_resource(dev, res);
+       pdata->sir0_regs = devm_platform_ioremap_resource(phy_pdev,
+                                                         phy_memnum++);
        if (IS_ERR(pdata->sir0_regs)) {
                dev_err(dev, "sir0 ioremap failed\n");
                ret = PTR_ERR(pdata->sir0_regs);
@@ -393,8 +390,8 @@ static int xgbe_platform_probe(struct platform_device *pdev)
        if (netif_msg_probe(pdata))
                dev_dbg(dev, "sir0_regs  = %p\n", pdata->sir0_regs);
 
-       res = platform_get_resource(phy_pdev, IORESOURCE_MEM, phy_memnum++);
-       pdata->sir1_regs = devm_ioremap_resource(dev, res);
+       pdata->sir1_regs = devm_platform_ioremap_resource(phy_pdev,
+                                                         phy_memnum++);
        if (IS_ERR(pdata->sir1_regs)) {
                dev_err(dev, "sir1 ioremap failed\n");
                ret = PTR_ERR(pdata->sir1_regs);