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

Commit 99c1790e authored by Michael Ellerman's avatar Michael Ellerman Committed by David S. Miller
Browse files

net: Remove NO_IRQ from powerpc-only network drivers 



We'd like to eventually remove NO_IRQ on powerpc, so remove usages of it
from powerpc-only drivers.

Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c20cb811

drivers/net/ethernet/freescale/fman/fman_mac.h

+1 −1
Original line number Diff line number Diff line
@@ -192,7 +192,7 @@ struct fman_mac_params { 
	/* A handle to the FM object this port related to */

	void *fm;

	/* MDIO exceptions interrupt source - not valid for all

	 * MACs; MUST be set to 'NO_IRQ' for MACs that don't have

	 * MACs; MUST be set to 0 for MACs that don't have

	 * mdio-irq, or for polling

	 */

	void *dev_id; /* device cookie used by the exception cbs */

drivers/net/ethernet/freescale/fs_enet/mac-fcc.c

+1 −1
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ static int do_pd_setup(struct fs_enet_private *fep) 
	int ret = -EINVAL;



	fep->interrupt = irq_of_parse_and_map(ofdev->dev.of_node, 0);

	if (fep->interrupt == NO_IRQ)

	if (!fep->interrupt)

		goto out;



	fep->fcc.fccp = of_iomap(ofdev->dev.of_node, 0);

drivers/net/ethernet/freescale/fs_enet/mac-fec.c

+1 −1
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ static int do_pd_setup(struct fs_enet_private *fep) 
	struct platform_device *ofdev = to_platform_device(fep->dev);



	fep->interrupt = irq_of_parse_and_map(ofdev->dev.of_node, 0);

	if (fep->interrupt == NO_IRQ)

	if (!fep->interrupt)

		return -EINVAL;



	fep->fec.fecp = of_iomap(ofdev->dev.of_node, 0);

drivers/net/ethernet/freescale/fs_enet/mac-scc.c

+1 −1
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ static int do_pd_setup(struct fs_enet_private *fep) 
	struct platform_device *ofdev = to_platform_device(fep->dev);



	fep->interrupt = irq_of_parse_and_map(ofdev->dev.of_node, 0);

	if (fep->interrupt == NO_IRQ)

	if (!fep->interrupt)

		return -EINVAL;



	fep->scc.sccp = of_iomap(ofdev->dev.of_node, 0);

drivers/net/ethernet/ibm/emac/core.c

+5 −5
Original line number Diff line number Diff line
@@ -2750,7 +2750,7 @@ static int emac_probe(struct platform_device *ofdev) 
	/* Get interrupts. EMAC irq is mandatory, WOL irq is optional */

	dev->emac_irq = irq_of_parse_and_map(np, 0);

	dev->wol_irq = irq_of_parse_and_map(np, 1);

	if (dev->emac_irq == NO_IRQ) {

	if (!dev->emac_irq) {

		printk(KERN_ERR "%s: Can't map main interrupt\n", np->full_name);

		goto err_free;

	}
@@ -2913,9 +2913,9 @@ static int emac_probe(struct platform_device *ofdev) 
 err_reg_unmap:

	iounmap(dev->emacp);

 err_irq_unmap:

	if (dev->wol_irq != NO_IRQ)

	if (dev->wol_irq)

		irq_dispose_mapping(dev->wol_irq);

	if (dev->emac_irq != NO_IRQ)

	if (dev->emac_irq)

		irq_dispose_mapping(dev->emac_irq);

 err_free:

	free_netdev(ndev);
@@ -2957,9 +2957,9 @@ static int emac_remove(struct platform_device *ofdev) 
	emac_dbg_unregister(dev);

	iounmap(dev->emacp);



	if (dev->wol_irq != NO_IRQ)

	if (dev->wol_irq)

		irq_dispose_mapping(dev->wol_irq);

	if (dev->emac_irq != NO_IRQ)

	if (dev->emac_irq)

		irq_dispose_mapping(dev->emac_irq);



	free_netdev(dev->ndev);