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

Commit 0d9b2ab1 authored by Fabio Estevam's avatar Fabio Estevam Committed by David S. Miller
Browse files

fec: Use devm_request_irq() 



Using devm_request_irq() can make the code smaller and cleaner.

Signed-off-by: default avatarFabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 399db75b

drivers/net/ethernet/freescale/fec_main.c

+3 −18
Original line number Diff line number Diff line
@@ -2149,15 +2149,11 @@ fec_probe(struct platform_device *pdev) 
			ret = irq;

			goto failed_irq;

		}

		ret = request_irq(irq, fec_enet_interrupt, IRQF_DISABLED, pdev->name, ndev);

		if (ret) {

			while (--i >= 0) {

				irq = platform_get_irq(pdev, i);

				free_irq(irq, ndev);

			}

		ret = devm_request_irq(&pdev->dev, irq, fec_enet_interrupt,

				       IRQF_DISABLED, pdev->name, ndev);

		if (ret)

			goto failed_irq;

	}

	}



	ret = fec_enet_mii_init(pdev);

	if (ret)
@@ -2180,11 +2176,6 @@ failed_register: 
	fec_enet_mii_remove(fep);

failed_mii_init:

failed_irq:

	for (i = 0; i < FEC_IRQ_NUM; i++) {

		irq = platform_get_irq(pdev, i);

		if (irq > 0)

			free_irq(irq, ndev);

	}

failed_init:

	if (fep->reg_phy)

		regulator_disable(fep->reg_phy);
@@ -2210,17 +2201,11 @@ fec_drv_remove(struct platform_device *pdev) 
{

	struct net_device *ndev = platform_get_drvdata(pdev);

	struct fec_enet_private *fep = netdev_priv(ndev);

	int i;



	cancel_delayed_work_sync(&(fep->delay_work.delay_work));

	unregister_netdev(ndev);

	fec_enet_mii_remove(fep);

	del_timer_sync(&fep->time_keep);

	for (i = 0; i < FEC_IRQ_NUM; i++) {

		int irq = platform_get_irq(pdev, i);

		if (irq > 0)

			free_irq(irq, ndev);

	}

	if (fep->reg_phy)

		regulator_disable(fep->reg_phy);

	if (fep->clk_ptp)