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

Commit 6892b41d authored by Lad, Prabhakar's avatar Lad, Prabhakar Committed by David S. Miller
Browse files

net: davinci: emac: Convert to devm_* api 



Use devm_ioremap_resource instead of devm_request_mem_region()/devm_ioremap()
and devm_request_irq() instead of request_irq().

This ensures more consistent error values and simplifies error paths.

Signed-off-by: default avatarLad, Prabhakar <prabhakar.csengg@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 76237576

drivers/net/ethernet/ti/davinci_emac.c

+9 −40
Original line number Diff line number Diff line
@@ -1532,7 +1532,7 @@ static int emac_dev_open(struct net_device *ndev) 
	struct device *emac_dev = &ndev->dev;

	u32 cnt;

	struct resource *res;

	int q, m, ret;

	int ret;

	int i = 0;

	int k = 0;

	struct emac_priv *priv = netdev_priv(ndev);
@@ -1567,7 +1567,8 @@ static int emac_dev_open(struct net_device *ndev) 


	while ((res = platform_get_resource(priv->pdev, IORESOURCE_IRQ, k))) {

		for (i = res->start; i <= res->end; i++) {

			if (request_irq(i, emac_irq, IRQF_DISABLED,

			if (devm_request_irq(&priv->pdev->dev, i, emac_irq,

					     IRQF_DISABLED,

					     ndev->name, ndev))

				goto rollback;

		}
@@ -1641,15 +1642,7 @@ static int emac_dev_open(struct net_device *ndev) 


rollback:



	dev_err(emac_dev, "DaVinci EMAC: request_irq() failed");



	for (q = k; k >= 0; k--) {

		for (m = i; m >= res->start; m--)

			free_irq(m, ndev);

		res = platform_get_resource(priv->pdev, IORESOURCE_IRQ, k-1);

		m = res->end;

	}



	dev_err(emac_dev, "DaVinci EMAC: devm_request_irq() failed");

	ret = -EBUSY;

err:

	pm_runtime_put(&priv->pdev->dev);
@@ -1667,9 +1660,6 @@ static int emac_dev_open(struct net_device *ndev) 
 */

static int emac_dev_stop(struct net_device *ndev)

{

	struct resource *res;

	int i = 0;

	int irq_num;

	struct emac_priv *priv = netdev_priv(ndev);

	struct device *emac_dev = &ndev->dev;
@@ -1685,13 +1675,6 @@ static int emac_dev_stop(struct net_device *ndev) 
	if (priv->phydev)

		phy_disconnect(priv->phydev);



	/* Free IRQ */

	while ((res = platform_get_resource(priv->pdev, IORESOURCE_IRQ, i))) {

		for (irq_num = res->start; irq_num <= res->end; irq_num++)

			free_irq(irq_num, priv->ndev);

		i++;

	}



	if (netif_msg_drv(priv))

		dev_notice(emac_dev, "DaVinci EMAC: %s stopped\n", ndev->name);
@@ -1856,7 +1839,7 @@ static int davinci_emac_probe(struct platform_device *pdev) 
	struct resource *res;

	struct net_device *ndev;

	struct emac_priv *priv;

	unsigned long size, hw_ram_addr;

	unsigned long hw_ram_addr;

	struct emac_platform_data *pdata;

	struct device *emac_dev;

	struct cpdma_params dma_params;
@@ -1907,25 +1890,11 @@ static int davinci_emac_probe(struct platform_device *pdev) 
	emac_dev = &ndev->dev;

	/* Get EMAC platform data */

	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	if (!res) {

		dev_err(&pdev->dev,"error getting res\n");

		rc = -ENOENT;

		goto no_pdata;

	}



	priv->emac_base_phys = res->start + pdata->ctrl_reg_offset;

	size = resource_size(res);

	if (!devm_request_mem_region(&pdev->dev, res->start,

				     size, ndev->name)) {

		dev_err(&pdev->dev, "failed request_mem_region() for regs\n");

		rc = -ENXIO;

		goto no_pdata;

	}



	priv->remap_addr = devm_ioremap(&pdev->dev, res->start, size);

	if (!priv->remap_addr) {

	priv->remap_addr = devm_ioremap_resource(&pdev->dev, res);

	if (IS_ERR(priv->remap_addr)) {

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

		rc = -ENOMEM;

		rc = PTR_ERR(priv->remap_addr);

		goto no_pdata;

	}

	priv->emac_base = priv->remap_addr + pdata->ctrl_reg_offset;