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

Commit d5b8d640 authored by Sudeep Holla's avatar Sudeep Holla Committed by David S. Miller
Browse files

net: gianfar: remove misuse of IRQF_NO_SUSPEND flag 



The device is set as wakeup capable using proper wakeup API but the
driver misuses IRQF_NO_SUSPEND to set the interrupt as wakeup source
which is incorrect.

This patch removes the use of IRQF_NO_SUSPEND flags replacing it with
enable_irq_wake instead.

Cc: "David S. Miller" <davem@davemloft.net>
Cc: Claudiu Manoil <claudiu.manoil@freescale.com>
Cc: Kevin Hao <haokexin@gmail.com>
Cc: netdev@vger.kernel.org
Signed-off-by: default avatarSudeep Holla <sudeep.holla@arm.com>
Acked-by: default avatarClaudiu Manoil <claudiu.manoil@freescale.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6ae459bd

drivers/net/ethernet/freescale/gianfar.c

+5 −4
Original line number Diff line number Diff line
@@ -1970,8 +1970,7 @@ static int register_grp_irqs(struct gfar_priv_grp *grp) 
		/* Install our interrupt handlers for Error,

		 * Transmit, and Receive

		 */

		err = request_irq(gfar_irq(grp, ER)->irq, gfar_error,

				  IRQF_NO_SUSPEND,

		err = request_irq(gfar_irq(grp, ER)->irq, gfar_error, 0,

				  gfar_irq(grp, ER)->name, grp);

		if (err < 0) {

			netif_err(priv, intr, dev, "Can't get IRQ %d\n",
@@ -1979,6 +1978,8 @@ static int register_grp_irqs(struct gfar_priv_grp *grp) 


			goto err_irq_fail;

		}

		enable_irq_wake(gfar_irq(grp, ER)->irq);



		err = request_irq(gfar_irq(grp, TX)->irq, gfar_transmit, 0,

				  gfar_irq(grp, TX)->name, grp);

		if (err < 0) {
@@ -1994,14 +1995,14 @@ static int register_grp_irqs(struct gfar_priv_grp *grp) 
			goto rx_irq_fail;

		}

	} else {

		err = request_irq(gfar_irq(grp, TX)->irq, gfar_interrupt,

				  IRQF_NO_SUSPEND,

		err = request_irq(gfar_irq(grp, TX)->irq, gfar_interrupt, 0,

				  gfar_irq(grp, TX)->name, grp);

		if (err < 0) {

			netif_err(priv, intr, dev, "Can't get IRQ %d\n",

				  gfar_irq(grp, TX)->irq);

			goto err_irq_fail;

		}

		enable_irq_wake(gfar_irq(grp, TX)->irq);

	}



	return 0;