diff options
Diffstat (limited to 'drivers/net/s2io.c')
-rw-r--r-- | drivers/net/s2io.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c index 1bf23e41f580..a231ab7d28dd 100644 --- a/drivers/net/s2io.c +++ b/drivers/net/s2io.c | |||
@@ -4029,8 +4029,7 @@ static int s2io_chk_rx_buffers(nic_t *sp, int rng_n) | |||
4029 | return 0; | 4029 | return 0; |
4030 | } | 4030 | } |
4031 | 4031 | ||
4032 | static irqreturn_t | 4032 | static irqreturn_t s2io_msi_handle(int irq, void *dev_id) |
4033 | s2io_msi_handle(int irq, void *dev_id, struct pt_regs *regs) | ||
4034 | { | 4033 | { |
4035 | struct net_device *dev = (struct net_device *) dev_id; | 4034 | struct net_device *dev = (struct net_device *) dev_id; |
4036 | nic_t *sp = dev->priv; | 4035 | nic_t *sp = dev->priv; |
@@ -4063,8 +4062,7 @@ s2io_msi_handle(int irq, void *dev_id, struct pt_regs *regs) | |||
4063 | return IRQ_HANDLED; | 4062 | return IRQ_HANDLED; |
4064 | } | 4063 | } |
4065 | 4064 | ||
4066 | static irqreturn_t | 4065 | static irqreturn_t s2io_msix_ring_handle(int irq, void *dev_id) |
4067 | s2io_msix_ring_handle(int irq, void *dev_id, struct pt_regs *regs) | ||
4068 | { | 4066 | { |
4069 | ring_info_t *ring = (ring_info_t *)dev_id; | 4067 | ring_info_t *ring = (ring_info_t *)dev_id; |
4070 | nic_t *sp = ring->nic; | 4068 | nic_t *sp = ring->nic; |
@@ -4078,8 +4076,7 @@ s2io_msix_ring_handle(int irq, void *dev_id, struct pt_regs *regs) | |||
4078 | return IRQ_HANDLED; | 4076 | return IRQ_HANDLED; |
4079 | } | 4077 | } |
4080 | 4078 | ||
4081 | static irqreturn_t | 4079 | static irqreturn_t s2io_msix_fifo_handle(int irq, void *dev_id) |
4082 | s2io_msix_fifo_handle(int irq, void *dev_id, struct pt_regs *regs) | ||
4083 | { | 4080 | { |
4084 | fifo_info_t *fifo = (fifo_info_t *)dev_id; | 4081 | fifo_info_t *fifo = (fifo_info_t *)dev_id; |
4085 | nic_t *sp = fifo->nic; | 4082 | nic_t *sp = fifo->nic; |
@@ -4155,7 +4152,6 @@ static void s2io_txpic_intr_handle(nic_t *sp) | |||
4155 | * s2io_isr - ISR handler of the device . | 4152 | * s2io_isr - ISR handler of the device . |
4156 | * @irq: the irq of the device. | 4153 | * @irq: the irq of the device. |
4157 | * @dev_id: a void pointer to the dev structure of the NIC. | 4154 | * @dev_id: a void pointer to the dev structure of the NIC. |
4158 | * @pt_regs: pointer to the registers pushed on the stack. | ||
4159 | * Description: This function is the ISR handler of the device. It | 4155 | * Description: This function is the ISR handler of the device. It |
4160 | * identifies the reason for the interrupt and calls the relevant | 4156 | * identifies the reason for the interrupt and calls the relevant |
4161 | * service routines. As a contongency measure, this ISR allocates the | 4157 | * service routines. As a contongency measure, this ISR allocates the |
@@ -4165,7 +4161,7 @@ static void s2io_txpic_intr_handle(nic_t *sp) | |||
4165 | * IRQ_HANDLED: will be returned if IRQ was handled by this routine | 4161 | * IRQ_HANDLED: will be returned if IRQ was handled by this routine |
4166 | * IRQ_NONE: will be returned if interrupt is not from our device | 4162 | * IRQ_NONE: will be returned if interrupt is not from our device |
4167 | */ | 4163 | */ |
4168 | static irqreturn_t s2io_isr(int irq, void *dev_id, struct pt_regs *regs) | 4164 | static irqreturn_t s2io_isr(int irq, void *dev_id) |
4169 | { | 4165 | { |
4170 | struct net_device *dev = (struct net_device *) dev_id; | 4166 | struct net_device *dev = (struct net_device *) dev_id; |
4171 | nic_t *sp = dev->priv; | 4167 | nic_t *sp = dev->priv; |