Commit c2f71c4c authored by David S. Miller's avatar David S. Miller

[NET SUN]: Update for irqreturn_t.

parent dd3d5004
...@@ -874,7 +874,7 @@ static void bigmac_rx(struct bigmac *bp) ...@@ -874,7 +874,7 @@ static void bigmac_rx(struct bigmac *bp)
printk(KERN_NOTICE "%s: Memory squeeze, deferring packet.\n", bp->dev->name); printk(KERN_NOTICE "%s: Memory squeeze, deferring packet.\n", bp->dev->name);
} }
static void bigmac_interrupt(int irq, void *dev_id, struct pt_regs *regs) static irqreturn_t bigmac_interrupt(int irq, void *dev_id, struct pt_regs *regs)
{ {
struct bigmac *bp = (struct bigmac *) dev_id; struct bigmac *bp = (struct bigmac *) dev_id;
u32 qec_status, bmac_status; u32 qec_status, bmac_status;
...@@ -895,6 +895,8 @@ static void bigmac_interrupt(int irq, void *dev_id, struct pt_regs *regs) ...@@ -895,6 +895,8 @@ static void bigmac_interrupt(int irq, void *dev_id, struct pt_regs *regs)
if (bmac_status & CREG_STAT_RXIRQ) if (bmac_status & CREG_STAT_RXIRQ)
bigmac_rx(bp); bigmac_rx(bp);
return IRQ_HANDLED;
} }
static int bigmac_open(struct net_device *dev) static int bigmac_open(struct net_device *dev)
......
...@@ -773,7 +773,7 @@ static void gem_rx(struct gem *gp) ...@@ -773,7 +773,7 @@ static void gem_rx(struct gem *gp)
gp->dev->name); gp->dev->name);
} }
static void gem_interrupt(int irq, void *dev_id, struct pt_regs *regs) static irqreturn_t gem_interrupt(int irq, void *dev_id, struct pt_regs *regs)
{ {
struct net_device *dev = dev_id; struct net_device *dev = dev_id;
struct gem *gp = dev->priv; struct gem *gp = dev->priv;
...@@ -792,6 +792,8 @@ static void gem_interrupt(int irq, void *dev_id, struct pt_regs *regs) ...@@ -792,6 +792,8 @@ static void gem_interrupt(int irq, void *dev_id, struct pt_regs *regs)
out: out:
spin_unlock(&gp->lock); spin_unlock(&gp->lock);
return IRQ_HANDLED;
} }
static void gem_tx_timeout(struct net_device *dev) static void gem_tx_timeout(struct net_device *dev)
......
...@@ -2101,7 +2101,7 @@ static void happy_meal_rx(struct happy_meal *hp, struct net_device *dev) ...@@ -2101,7 +2101,7 @@ static void happy_meal_rx(struct happy_meal *hp, struct net_device *dev)
RXD((">")); RXD((">"));
} }
static void happy_meal_interrupt(int irq, void *dev_id, struct pt_regs *regs) static irqreturn_t happy_meal_interrupt(int irq, void *dev_id, struct pt_regs *regs)
{ {
struct net_device *dev = (struct net_device *) dev_id; struct net_device *dev = (struct net_device *) dev_id;
struct happy_meal *hp = dev->priv; struct happy_meal *hp = dev->priv;
...@@ -2135,10 +2135,12 @@ static void happy_meal_interrupt(int irq, void *dev_id, struct pt_regs *regs) ...@@ -2135,10 +2135,12 @@ static void happy_meal_interrupt(int irq, void *dev_id, struct pt_regs *regs)
HMD(("done\n")); HMD(("done\n"));
out: out:
spin_unlock(&hp->happy_lock); spin_unlock(&hp->happy_lock);
return IRQ_HANDLED;
} }
#ifdef CONFIG_SBUS #ifdef CONFIG_SBUS
static void quattro_sbus_interrupt(int irq, void *cookie, struct pt_regs *ptregs) static irqreturn_t quattro_sbus_interrupt(int irq, void *cookie, struct pt_regs *ptregs)
{ {
struct quattro *qp = (struct quattro *) cookie; struct quattro *qp = (struct quattro *) cookie;
int i; int i;
...@@ -2183,6 +2185,8 @@ static void quattro_sbus_interrupt(int irq, void *cookie, struct pt_regs *ptregs ...@@ -2183,6 +2185,8 @@ static void quattro_sbus_interrupt(int irq, void *cookie, struct pt_regs *ptregs
spin_unlock(&hp->happy_lock); spin_unlock(&hp->happy_lock);
} }
HMD(("done\n")); HMD(("done\n"));
return IRQ_HANDLED;
} }
#endif #endif
......
...@@ -812,7 +812,7 @@ static void lance_tx_pio(struct net_device *dev) ...@@ -812,7 +812,7 @@ static void lance_tx_pio(struct net_device *dev)
spin_unlock(&lp->lock); spin_unlock(&lp->lock);
} }
static void lance_interrupt(int irq, void *dev_id, struct pt_regs *regs) static irqreturn_t lance_interrupt(int irq, void *dev_id, struct pt_regs *regs)
{ {
struct net_device *dev = (struct net_device *)dev_id; struct net_device *dev = (struct net_device *)dev_id;
struct lance_private *lp = (struct lance_private *)dev->priv; struct lance_private *lp = (struct lance_private *)dev->priv;
...@@ -871,6 +871,8 @@ static void lance_interrupt(int irq, void *dev_id, struct pt_regs *regs) ...@@ -871,6 +871,8 @@ static void lance_interrupt(int irq, void *dev_id, struct pt_regs *regs)
} }
sbus_writew(LE_C0_INEA, lp->lregs + RDP); sbus_writew(LE_C0_INEA, lp->lregs + RDP);
return IRQ_HANDLED;
} }
/* Build a fake network packet and send it to ourselves. */ /* Build a fake network packet and send it to ourselves. */
......
...@@ -456,7 +456,7 @@ static void qe_tx_reclaim(struct sunqe *qep); ...@@ -456,7 +456,7 @@ static void qe_tx_reclaim(struct sunqe *qep);
* so we just run through each qe and check to see who is signaling * so we just run through each qe and check to see who is signaling
* and thus needs to be serviced. * and thus needs to be serviced.
*/ */
static void qec_interrupt(int irq, void *dev_id, struct pt_regs *regs) static irqreturn_t qec_interrupt(int irq, void *dev_id, struct pt_regs *regs)
{ {
struct sunqec *qecp = (struct sunqec *) dev_id; struct sunqec *qecp = (struct sunqec *) dev_id;
u32 qec_status; u32 qec_status;
...@@ -495,6 +495,8 @@ static void qec_interrupt(int irq, void *dev_id, struct pt_regs *regs) ...@@ -495,6 +495,8 @@ static void qec_interrupt(int irq, void *dev_id, struct pt_regs *regs)
qec_status >>= 4; qec_status >>= 4;
channel++; channel++;
} }
return IRQ_HANDLED;
} }
static int qe_open(struct net_device *dev) static int qe_open(struct net_device *dev)
......
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