8xx: fec: fix interrupt handler prototypes
PATCH 1/1 8xx: fec: fix interrupt handler prototypes
From: Aristeu Sergio Rozanski Filho <[email protected]>
8xx: fec: fix interrupt handler prototypes
Signed-off-by Aristeu Sergio Rozanski Filho <[email protected]>
Signed-off-by Marcelo Tosatti <[email protected]>
arch/ppc/8xx_io/fec.c +10 -5
@@ -199,7 +199,8 @@#ifdef CONFIG_USE_MDIO static void fec_enet_mii (struct net_device *dev);#endif /* CONFIG_USE_MDIO */ -static void fec_enet_interrupt (int irq,void * dev_id,struct pt_regs * regs); +static irqreturn_t fec_enet_interrupt (int irq,void * dev_id, +struct pt_regs * regs);#ifdef CONFIG_FEC_PACKETHOOK static void fec_enet_tx (struct net_device *dev,__u32 regval);static void fec_enet_rx (struct net_device *dev,__u32 regval);
@@ -471,7 +472,7 @@/* The interrupt handler. * This is called from the MPC core interrupt. */ -static void +static irqreturn_t fec_enet_interrupt (int irq,void * dev_id,struct pt_regs * regs) {struct net_device *dev = dev_id;
@@ -525,6 +526,7 @@ } } +return IRQ_RETVAL (IRQ_HANDLED ); }
@@ -1403,11 +1405,11 @@/* This interrupt occurs when the PHY detects a link change. */ -static void +static#ifdef CONFIG_RPXCLASSIC -mii_link_interrupt(void *dev_id) +void mii_link_interrupt(void *dev_id)#else -mii_link_interrupt(int irq, void * dev_id, struct pt_regs * regs) +irqreturn_t mii_link_interrupt(int irq, void * dev_id, struct pt_regs * regs)#endif {#ifdef CONFIG_USE_MDIO
@@ -1440,6 +1442,9 @@printk ("%s[%d] %s: unexpected Link interrupt\n" , __FILE__,__LINE__,__FUNCTION__);#endif /* CONFIG_USE_MDIO */ +#ifndef CONFIG_RPXCLASSIC +return IRQ_RETVAL (IRQ_HANDLED ); +#endif /* CONFIG_RPXCLASSIC */ } static int