diff options
author | Yang Yingliang <yangyingliang@huawei.com> | 2021-06-10 15:36:22 +0800 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2021-06-10 13:53:13 -0700 |
commit | 47651c51c02fc4937b39b2d2207aa0d9d26a4b58 (patch) | |
tree | 5caba557b35385bb570367275cf5b4bf8cf037f0 /drivers/net | |
parent | 0b462d017caff780f4922872c7098b193feee8b6 (diff) | |
download | linux-stable-47651c51c02fc4937b39b2d2207aa0d9d26a4b58.tar.gz linux-stable-47651c51c02fc4937b39b2d2207aa0d9d26a4b58.tar.bz2 linux-stable-47651c51c02fc4937b39b2d2207aa0d9d26a4b58.zip |
net: axienet: Use devm_platform_get_and_ioremap_resource()
Use devm_platform_get_and_ioremap_resource() to simplify
code.
Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c index e29ad9a86a3c..13cd799541aa 100644 --- a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c +++ b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c @@ -1894,8 +1894,7 @@ static int axienet_probe(struct platform_device *pdev) goto cleanup_clk; /* Map device registers */ - ethres = platform_get_resource(pdev, IORESOURCE_MEM, 0); - lp->regs = devm_ioremap_resource(&pdev->dev, ethres); + lp->regs = devm_platform_get_and_ioremap_resource(pdev, 0, ðres); if (IS_ERR(lp->regs)) { ret = PTR_ERR(lp->regs); goto cleanup_clk; @@ -2010,9 +2009,7 @@ static int axienet_probe(struct platform_device *pdev) lp->eth_irq = platform_get_irq_optional(pdev, 0); } else { /* Check for these resources directly on the Ethernet node. */ - struct resource *res = platform_get_resource(pdev, - IORESOURCE_MEM, 1); - lp->dma_regs = devm_ioremap_resource(&pdev->dev, res); + lp->dma_regs = devm_platform_get_and_ioremap_resource(pdev, 1, NULL); lp->rx_irq = platform_get_irq(pdev, 1); lp->tx_irq = platform_get_irq(pdev, 0); lp->eth_irq = platform_get_irq_optional(pdev, 2); |