From 2cfe19bf2fa33d0154dbee8140fe114c79e29fdf Mon Sep 17 00:00:00 2001
From: Yoann Padioleau <padator@wanadoo.fr>
Date: Fri, 6 Jul 2007 02:39:56 -0700
Subject: [PATCH] --- yaml --- r: 58227 b: refs/heads/master c:
 0da2f0f164f098bb4447c714b552ac1681b2d6e8 h: refs/heads/master i:   58225:
 2edce226fdb88b81e12f914f73263fef2bf1d4e5   58223:
 3b3e2bbf727c6b52d53222d2ca0c2aaa0703ac9a v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/atm/firestream.c     | 2 +-
 trunk/drivers/net/arm/am79c961a.c  | 2 +-
 trunk/drivers/net/ixp2000/ixpdev.c | 2 +-
 trunk/drivers/net/sb1250-mac.c     | 2 +-
 trunk/drivers/usb/misc/uss720.c    | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index d89151a21b49..6dd69497ce25 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 071922c08cef62e194d83db1cc4fa75892c69651
+refs/heads/master: 0da2f0f164f098bb4447c714b552ac1681b2d6e8
diff --git a/trunk/drivers/atm/firestream.c b/trunk/drivers/atm/firestream.c
index 7f6d02ce1b5f..38b688f9f6a9 100644
--- a/trunk/drivers/atm/firestream.c
+++ b/trunk/drivers/atm/firestream.c
@@ -1654,7 +1654,7 @@ static void fs_poll (unsigned long data)
 {
 	struct fs_dev *dev = (struct fs_dev *) data;
   
-	fs_irq (0, dev, NULL);
+	fs_irq (0, dev);
 	dev->timer.expires = jiffies + FS_POLL_FREQ;
 	add_timer (&dev->timer);
 }
diff --git a/trunk/drivers/net/arm/am79c961a.c b/trunk/drivers/net/arm/am79c961a.c
index 8f0d7ce503c9..2143eeb7a2b0 100644
--- a/trunk/drivers/net/arm/am79c961a.c
+++ b/trunk/drivers/net/arm/am79c961a.c
@@ -634,7 +634,7 @@ static void am79c961_poll_controller(struct net_device *dev)
 {
 	unsigned long flags;
 	local_irq_save(flags);
-	am79c961_interrupt(dev->irq, dev, NULL);
+	am79c961_interrupt(dev->irq, dev);
 	local_irq_restore(flags);
 }
 #endif
diff --git a/trunk/drivers/net/ixp2000/ixpdev.c b/trunk/drivers/net/ixp2000/ixpdev.c
index 6683afc02aaa..d5f694fc4a21 100644
--- a/trunk/drivers/net/ixp2000/ixpdev.c
+++ b/trunk/drivers/net/ixp2000/ixpdev.c
@@ -222,7 +222,7 @@ static irqreturn_t ixpdev_interrupt(int irq, void *dev_id)
 static void ixpdev_poll_controller(struct net_device *dev)
 {
 	disable_irq(IRQ_IXP2000_THDA0);
-	ixpdev_interrupt(IRQ_IXP2000_THDA0, dev, NULL);
+	ixpdev_interrupt(IRQ_IXP2000_THDA0, dev);
 	enable_irq(IRQ_IXP2000_THDA0);
 }
 #endif
diff --git a/trunk/drivers/net/sb1250-mac.c b/trunk/drivers/net/sb1250-mac.c
index 132e2148b21c..e7fdcf15b5a7 100644
--- a/trunk/drivers/net/sb1250-mac.c
+++ b/trunk/drivers/net/sb1250-mac.c
@@ -1159,7 +1159,7 @@ static void sbmac_netpoll(struct net_device *netdev)
 
 	__raw_writeq(0, sc->sbm_imr);
 
-	sbmac_intr(irq, netdev, NULL);
+	sbmac_intr(irq, netdev);
 
 #ifdef CONFIG_SBMAC_COALESCE
 	__raw_writeq(((M_MAC_INT_EOP_COUNT | M_MAC_INT_EOP_TIMER) << S_MAC_TX_CH0) |
diff --git a/trunk/drivers/usb/misc/uss720.c b/trunk/drivers/usb/misc/uss720.c
index 70250252ae2a..1a60f9c473ad 100644
--- a/trunk/drivers/usb/misc/uss720.c
+++ b/trunk/drivers/usb/misc/uss720.c
@@ -336,7 +336,7 @@ static int uss720_irq(int usbstatus, void *buffer, int len, void *dev_id)
 	memcpy(priv->reg, buffer, 4);
 	/* if nAck interrupts are enabled and we have an interrupt, call the interrupt procedure */
 	if (priv->reg[2] & priv->reg[1] & 0x10)
-		parport_generic_irq(0, pp, NULL);
+		parport_generic_irq(0, pp);
 	return 1;
 }
 #endif