Commit 39b9b780 authored by Rosen Penev's avatar Rosen Penev Committed by Jakub Kicinski
Browse files

net: ibm: emac: get rid of wol_irq

parent c092d0be
Loading
Loading
Loading
Loading
+3 −10
Original line number Diff line number Diff line
@@ -3029,9 +3029,8 @@ static int emac_probe(struct platform_device *ofdev)
	if (err)
		goto err_gone;

	/* Get interrupts. EMAC irq is mandatory, WOL irq is optional */
	/* Get interrupts. EMAC irq is mandatory */
	dev->emac_irq = irq_of_parse_and_map(np, 0);
	dev->wol_irq = irq_of_parse_and_map(np, 1);
	if (!dev->emac_irq) {
		printk(KERN_ERR "%pOF: Can't map main interrupt\n", np);
		err = -ENODEV;
@@ -3055,13 +3054,13 @@ static int emac_probe(struct platform_device *ofdev)
	if (!dev->emacp) {
		dev_err(&ofdev->dev, "can't map device registers");
		err = -ENOMEM;
		goto err_irq_unmap;
		goto err_gone;
	}

	/* Wait for dependent devices */
	err = emac_wait_deps(dev);
	if (err)
		goto err_irq_unmap;
		goto err_gone;
	dev->mal = platform_get_drvdata(dev->mal_dev);
	if (dev->mdio_dev != NULL)
		dev->mdio_instance = platform_get_drvdata(dev->mdio_dev);
@@ -3189,9 +3188,6 @@ static int emac_probe(struct platform_device *ofdev)
	mal_unregister_commac(dev->mal, &dev->commac);
 err_rel_deps:
	emac_put_deps(dev);
 err_irq_unmap:
	if (dev->wol_irq)
		irq_dispose_mapping(dev->wol_irq);
 err_gone:
	if (blist)
		*blist = NULL;
@@ -3218,9 +3214,6 @@ static void emac_remove(struct platform_device *ofdev)

	mal_unregister_commac(dev->mal, &dev->commac);
	emac_put_deps(dev);

	if (dev->wol_irq)
		irq_dispose_mapping(dev->wol_irq);
}

/* XXX Features in here should be replaced by properties... */