Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 46aa27df authored by Srikanth Thokala's avatar Srikanth Thokala Committed by David S. Miller
Browse files

net: axienet: Use devm_* calls 



use devm_* calls

Signed-off-by: default avatarSrikanth Thokala <sthokal@xilinx.com>
Signed-off-by: default avatarMichal Simek <michal.simek@xilinx.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 95219aa5

drivers/net/ethernet/xilinx/xilinx_axienet_main.c

+27 −27
Original line number Original line Diff line number Diff line
@@ -1499,6 +1499,7 @@ static int axienet_of_probe(struct platform_device *pdev) 
	struct axienet_local *lp;

	struct axienet_local *lp;

	struct net_device *ndev;

	struct net_device *ndev;

	const void *addr;

	const void *addr;

	struct resource *ethres, dmares;





	ndev = alloc_etherdev(sizeof(*lp));

	ndev = alloc_etherdev(sizeof(*lp));

	if (!ndev)

	if (!ndev)
@@ -1517,12 +1518,14 @@ static int axienet_of_probe(struct platform_device *pdev) 
	lp->dev = &pdev->dev;

	lp->dev = &pdev->dev;

	lp->options = XAE_OPTION_DEFAULTS;

	lp->options = XAE_OPTION_DEFAULTS;

	/* Map device registers */

	/* Map device registers */

	lp->regs = of_iomap(pdev->dev.of_node, 0);

	ethres = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	lp->regs = devm_ioremap_resource(&pdev->dev, ethres);

	if (!lp->regs) {

	if (!lp->regs) {

		dev_err(&pdev->dev, "could not map Axi Ethernet regs.\n");

		dev_err(&pdev->dev, "could not map Axi Ethernet regs.\n");

		ret = -ENOMEM;

		ret = -ENOMEM;

		goto nodev;

		goto free_netdev;

	}

	}



	/* Setup checksum offload, but default to off if not specified */

	/* Setup checksum offload, but default to off if not specified */

	lp->features = 0;

	lp->features = 0;
@@ -1580,17 +1583,21 @@ static int axienet_of_probe(struct platform_device *pdev) 




	/* Find the DMA node, map the DMA registers, and decode the DMA IRQs */

	/* Find the DMA node, map the DMA registers, and decode the DMA IRQs */

	np = of_parse_phandle(pdev->dev.of_node, "axistream-connected", 0);

	np = of_parse_phandle(pdev->dev.of_node, "axistream-connected", 0);

	if (!np) {

	if (IS_ERR(np)) {

		dev_err(&pdev->dev, "could not find DMA node\n");

		dev_err(&pdev->dev, "could not find DMA node\n");

		ret = -ENODEV;

		ret = PTR_ERR(np);

		goto err_iounmap;

		goto free_netdev;

	}

	}

	lp->dma_regs = of_iomap(np, 0);

	ret = of_address_to_resource(np, 0, &dmares);

	if (lp->dma_regs) {

	if (ret) {

		dev_dbg(&pdev->dev, "MEM base: %p\n", lp->dma_regs);

		dev_err(&pdev->dev, "unable to get DMA resource\n");

	} else {

		goto free_netdev;

		dev_err(&pdev->dev, "unable to map DMA registers\n");

	}

		of_node_put(np);

	lp->dma_regs = devm_ioremap_resource(&pdev->dev, &dmares);

	if (!lp->dma_regs) {

		dev_err(&pdev->dev, "could not map DMA regs\n");

		ret = -ENOMEM;

		goto free_netdev;

	}

	}

	lp->rx_irq = irq_of_parse_and_map(np, 1);

	lp->rx_irq = irq_of_parse_and_map(np, 1);

	lp->tx_irq = irq_of_parse_and_map(np, 0);

	lp->tx_irq = irq_of_parse_and_map(np, 0);
@@ -1598,7 +1605,7 @@ static int axienet_of_probe(struct platform_device *pdev) 
	if ((lp->rx_irq <= 0) || (lp->tx_irq <= 0)) {

	if ((lp->rx_irq <= 0) || (lp->tx_irq <= 0)) {

		dev_err(&pdev->dev, "could not determine irqs\n");

		dev_err(&pdev->dev, "could not determine irqs\n");

		ret = -ENOMEM;

		ret = -ENOMEM;

		goto err_iounmap_2;

		goto free_netdev;

	}

	}





	/* Retrieve the MAC address */

	/* Retrieve the MAC address */
@@ -1606,7 +1613,7 @@ static int axienet_of_probe(struct platform_device *pdev) 
	if ((!addr) || (size != 6)) {

	if ((!addr) || (size != 6)) {

		dev_err(&pdev->dev, "could not find MAC address\n");

		dev_err(&pdev->dev, "could not find MAC address\n");

		ret = -ENODEV;

		ret = -ENODEV;

		goto err_iounmap_2;

		goto free_netdev;

	}

	}

	axienet_set_mac_address(ndev, (void *) addr);

	axienet_set_mac_address(ndev, (void *) addr);
@@ -1614,27 +1621,23 @@ static int axienet_of_probe(struct platform_device *pdev) 
	lp->coalesce_count_tx = XAXIDMA_DFT_TX_THRESHOLD;

	lp->coalesce_count_tx = XAXIDMA_DFT_TX_THRESHOLD;





	lp->phy_node = of_parse_phandle(pdev->dev.of_node, "phy-handle", 0);

	lp->phy_node = of_parse_phandle(pdev->dev.of_node, "phy-handle", 0);

	if (lp->phy_node)

	if (lp->phy_node) {

		ret = axienet_mdio_setup(lp, pdev->dev.of_node);

		ret = axienet_mdio_setup(lp, pdev->dev.of_node);

		if (ret)

		if (ret)

			dev_warn(&pdev->dev, "error registering MDIO bus\n");

			dev_warn(&pdev->dev, "error registering MDIO bus\n");

	}





	ret = register_netdev(lp->ndev);

	ret = register_netdev(lp->ndev);

	if (ret) {

	if (ret) {

		dev_err(lp->dev, "register_netdev() error (%i)\n", ret);

		dev_err(lp->dev, "register_netdev() error (%i)\n", ret);

		goto err_iounmap_2;

		goto free_netdev;

	}

	}





	return 0;

	return 0;





err_iounmap_2:

free_netdev:

	if (lp->dma_regs)

		iounmap(lp->dma_regs);

err_iounmap:

	iounmap(lp->regs);

nodev:

	free_netdev(ndev);

	free_netdev(ndev);

	ndev = NULL;



	return ret;

	return ret;

}

}
@@ -1649,9 +1652,6 @@ static int axienet_of_remove(struct platform_device *pdev) 
	of_node_put(lp->phy_node);

	of_node_put(lp->phy_node);

	lp->phy_node = NULL;

	lp->phy_node = NULL;





	iounmap(lp->regs);

	if (lp->dma_regs)

		iounmap(lp->dma_regs);

	free_netdev(ndev);

	free_netdev(ndev);





	return 0;

	return 0;