Merge git://git.infradead.org/~dhowells/irq-2.6

* git://git.infradead.org/~dhowells/irq-2.6:
  IRQ: Maintain regs pointer globally rather than passing to IRQ handlers
  IRQ: Typedef the IRQ handler function type
  IRQ: Typedef the IRQ flow handler function type

1 files changed, 4 insertions, 4 deletions

diff --git a/drivers/net/ibmveth.c b/drivers/net/ibmveth.c
index 767203d35bc2..4bac3cd8f235 100644
--- a/drivers/net/ibmveth.c
+++ b/drivers/net/ibmveth.c
@@ -93,7 +93,7 @@ static void ibmveth_proc_register_driver(void);
 static void ibmveth_proc_unregister_driver(void);
 static void ibmveth_proc_register_adapter(struct ibmveth_adapter *adapter);
 static void ibmveth_proc_unregister_adapter(struct ibmveth_adapter *adapter);
-static irqreturn_t ibmveth_interrupt(int irq, void *dev_instance, struct pt_regs *regs);
+static irqreturn_t ibmveth_interrupt(int irq, void *dev_instance);
 static inline void ibmveth_rxq_harvest_buffer(struct ibmveth_adapter *adapter);
 static struct kobj_type ktype_veth_pool;
 
@@ -543,7 +543,7 @@ static int ibmveth_open(struct net_device *netdev)
         }
 
         ibmveth_debug_printk("initial replenish cycle\n");
-        ibmveth_interrupt(netdev->irq, netdev, NULL);
+        ibmveth_interrupt(netdev->irq, netdev);
 
         netif_start_queue(netdev);
 
@@ -816,7 +816,7 @@ static int ibmveth_poll(struct net_device *netdev, int *budget)
         return 0;
 }
 
-static irqreturn_t ibmveth_interrupt(int irq, void *dev_instance, struct pt_regs *regs)
+static irqreturn_t ibmveth_interrupt(int irq, void *dev_instance)
 {
         struct net_device *netdev = dev_instance;
         struct ibmveth_adapter *adapter = netdev->priv;
@@ -1261,7 +1261,7 @@ const char * buf, size_t count)
         }
 
         /* kick the interrupt handler to allocate/deallocate pools */
-        ibmveth_interrupt(netdev->irq, netdev, NULL);
+        ibmveth_interrupt(netdev->irq, netdev);
         return count;
 }