[NET SUN]: Update for irqreturn_t.

5 files changed, 18 insertions, 6 deletions

diff --git a/drivers/net/sunbmac.c b/drivers/net/sunbmac.c
index 21cbba97fb62..2b3197ed55d8 100644
--- a/drivers/net/sunbmac.c
+++ b/drivers/net/sunbmac.c
@@ -874,7 +874,7 @@ static void bigmac_rx(struct bigmac *bp)
 		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;
 	u32 qec_status, bmac_status;
@@ -895,6 +895,8 @@ static void bigmac_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 
 	if (bmac_status & CREG_STAT_RXIRQ)
 		bigmac_rx(bp);
+
+	return IRQ_HANDLED;
 }
 
 static int bigmac_open(struct net_device *dev)
diff --git a/drivers/net/sungem.c b/drivers/net/sungem.c
index daeb1f39e9c8..9038a1740b72 100644
--- a/drivers/net/sungem.c
+++ b/drivers/net/sungem.c
@@ -773,7 +773,7 @@ static void gem_rx(struct gem *gp)
 		       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 gem *gp = dev->priv;
@@ -792,6 +792,8 @@ static void gem_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 
 out:
 	spin_unlock(&gp->lock);
+
+	return IRQ_HANDLED;
 }
 
 static void gem_tx_timeout(struct net_device *dev)
diff --git a/drivers/net/sunhme.c b/drivers/net/sunhme.c
index 631d07021d81..9d87b0917a59 100644
--- a/drivers/net/sunhme.c
+++ b/drivers/net/sunhme.c
@@ -2101,7 +2101,7 @@ static void happy_meal_rx(struct happy_meal *hp, struct net_device *dev)
 	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 happy_meal *hp  = dev->priv;
@@ -2135,10 +2135,12 @@ static void happy_meal_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 	HMD(("done\n"));
 out:
 	spin_unlock(&hp->happy_lock);
+
+	return IRQ_HANDLED;
 }
 
 #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;
 	int i;
@@ -2183,6 +2185,8 @@ static void quattro_sbus_interrupt(int irq, void *cookie, struct pt_regs *ptregs
 		spin_unlock(&hp->happy_lock);
 	}
 	HMD(("done\n"));
+
+	return IRQ_HANDLED;
 }
 #endif
 
diff --git a/drivers/net/sunlance.c b/drivers/net/sunlance.c
index 69ae9c2a6a2a..52e66ed7c0e7 100644
--- a/drivers/net/sunlance.c
+++ b/drivers/net/sunlance.c
@@ -812,7 +812,7 @@ out:
 	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 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)
 	}
 
 	sbus_writew(LE_C0_INEA, lp->lregs + RDP);
+
+	return IRQ_HANDLED;
 }
 
 /* Build a fake network packet and send it to ourselves. */
diff --git a/drivers/net/sunqe.c b/drivers/net/sunqe.c
index 78025bcd88e6..a80a2f87c3e1 100644
--- a/drivers/net/sunqe.c
+++ b/drivers/net/sunqe.c
@@ -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
  * 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;
 	u32 qec_status;
@@ -495,6 +495,8 @@ static void qec_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 		qec_status >>= 4;
 		channel++;
 	}
+
+	return IRQ_HANDLED;
 }
 
 static int qe_open(struct net_device *dev)