Commit 47651c51 authored by Yang Yingliang's avatar Yang Yingliang Committed by David S. Miller
Browse files

net: axienet: Use devm_platform_get_and_ioremap_resource() 



Use devm_platform_get_and_ioremap_resource() to simplify
code.

Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0b462d01

drivers/net/ethernet/xilinx/xilinx_axienet_main.c

+2 −5
Original line number Diff line number Diff line
@@ -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, &ethres);

	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);