| Message ID | 20190821123203.71404-1-yuehaibing@huawei.com |
|---|---|
| State | Accepted |
| Delegated to: | David Miller |
| Headers | show |
| Series | [net-next] amd-xgbe: use devm_platform_ioremap_resource() to simplify code | expand |
On 8/21/19 7:32 AM, YueHaibing wrote: > 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> > --- > drivers/net/ethernet/amd/xgbe/xgbe-platform.c | 19 ++++++++----------- > 1 file changed, 8 insertions(+), 11 deletions(-) > > diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-platform.c b/drivers/net/ethernet/amd/xgbe/xgbe-platform.c > index dce9e59..4ebd241 100644 > --- a/drivers/net/ethernet/amd/xgbe/xgbe-platform.c > +++ b/drivers/net/ethernet/amd/xgbe/xgbe-platform.c > @@ -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); >
From: YueHaibing <yuehaibing@huawei.com> Date: Wed, 21 Aug 2019 20:32:03 +0800 > 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> Applied.
diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-platform.c b/drivers/net/ethernet/amd/xgbe/xgbe-platform.c index dce9e59..4ebd241 100644 --- a/drivers/net/ethernet/amd/xgbe/xgbe-platform.c +++ b/drivers/net/ethernet/amd/xgbe/xgbe-platform.c @@ -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);
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> --- drivers/net/ethernet/amd/xgbe/xgbe-platform.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-)