Commit fbccb3d7 authored by Aristeu Sergio Rozanski Filho's avatar Aristeu Sergio Rozanski Filho Committed by Linus Torvalds

[PATCH] ppc32: 8xx: fec: fix interrupt handler prototypes

8xx: fec: fix interrupt handler prototypes
Signed-off-by: default avatarAristeu Sergio Rozanski Filho <aris@conectiva.com.br>
Signed-off-by: default avatarMarcelo Tosatti <marcelo.tosatti@cyclades.com>
Cc: Jeff Garzik <jgarzik@pobox.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent fc007ddd
...@@ -199,7 +199,8 @@ static int fec_enet_start_xmit(struct sk_buff *skb, struct net_device *dev); ...@@ -199,7 +199,8 @@ static int fec_enet_start_xmit(struct sk_buff *skb, struct net_device *dev);
#ifdef CONFIG_USE_MDIO #ifdef CONFIG_USE_MDIO
static void fec_enet_mii(struct net_device *dev); static void fec_enet_mii(struct net_device *dev);
#endif /* CONFIG_USE_MDIO */ #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 #ifdef CONFIG_FEC_PACKETHOOK
static void fec_enet_tx(struct net_device *dev, __u32 regval); static void fec_enet_tx(struct net_device *dev, __u32 regval);
static void fec_enet_rx(struct net_device *dev, __u32 regval); static void fec_enet_rx(struct net_device *dev, __u32 regval);
...@@ -471,7 +472,7 @@ fec_timeout(struct net_device *dev) ...@@ -471,7 +472,7 @@ fec_timeout(struct net_device *dev)
/* The interrupt handler. /* The interrupt handler.
* This is called from the MPC core interrupt. * 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) fec_enet_interrupt(int irq, void * dev_id, struct pt_regs * regs)
{ {
struct net_device *dev = dev_id; struct net_device *dev = dev_id;
...@@ -525,6 +526,7 @@ printk("%s[%d] %s: unexpected FEC_ENET_MII event\n", __FILE__,__LINE__,__FUNCTIO ...@@ -525,6 +526,7 @@ printk("%s[%d] %s: unexpected FEC_ENET_MII event\n", __FILE__,__LINE__,__FUNCTIO
} }
} }
return IRQ_RETVAL(IRQ_HANDLED);
} }
...@@ -1403,11 +1405,11 @@ mii_discover_phy(uint mii_reg, struct net_device *dev) ...@@ -1403,11 +1405,11 @@ mii_discover_phy(uint mii_reg, struct net_device *dev)
/* This interrupt occurs when the PHY detects a link change. /* This interrupt occurs when the PHY detects a link change.
*/ */
static void static
#ifdef CONFIG_RPXCLASSIC #ifdef CONFIG_RPXCLASSIC
mii_link_interrupt(void *dev_id) void mii_link_interrupt(void *dev_id)
#else #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 #endif
{ {
#ifdef CONFIG_USE_MDIO #ifdef CONFIG_USE_MDIO
...@@ -1440,6 +1442,9 @@ mii_link_interrupt(int irq, void * dev_id, struct pt_regs * regs) ...@@ -1440,6 +1442,9 @@ mii_link_interrupt(int irq, void * dev_id, struct pt_regs * regs)
printk("%s[%d] %s: unexpected Link interrupt\n", __FILE__,__LINE__,__FUNCTION__); printk("%s[%d] %s: unexpected Link interrupt\n", __FILE__,__LINE__,__FUNCTION__);
#endif /* CONFIG_USE_MDIO */ #endif /* CONFIG_USE_MDIO */
#ifndef CONFIG_RPXCLASSIC
return IRQ_RETVAL(IRQ_HANDLED);
#endif /* CONFIG_RPXCLASSIC */
} }
static int static int
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment