diff options
Diffstat (limited to 'drivers/message')
-rw-r--r-- | drivers/message/fusion/mptbase.c | 5 | ||||
-rw-r--r-- | drivers/message/i2o/pci.c | 3 |
2 files changed, 3 insertions, 5 deletions
diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c index 29d0635cce1d..e5c72719debc 100644 --- a/drivers/message/fusion/mptbase.c +++ b/drivers/message/fusion/mptbase.c | |||
@@ -122,7 +122,7 @@ static DECLARE_WAIT_QUEUE_HEAD(mpt_waitq); | |||
122 | /* | 122 | /* |
123 | * Forward protos... | 123 | * Forward protos... |
124 | */ | 124 | */ |
125 | static irqreturn_t mpt_interrupt(int irq, void *bus_id, struct pt_regs *r); | 125 | static irqreturn_t mpt_interrupt(int irq, void *bus_id); |
126 | static int mpt_base_reply(MPT_ADAPTER *ioc, MPT_FRAME_HDR *req, MPT_FRAME_HDR *reply); | 126 | static int mpt_base_reply(MPT_ADAPTER *ioc, MPT_FRAME_HDR *req, MPT_FRAME_HDR *reply); |
127 | static int mpt_handshake_req_reply_wait(MPT_ADAPTER *ioc, int reqBytes, | 127 | static int mpt_handshake_req_reply_wait(MPT_ADAPTER *ioc, int reqBytes, |
128 | u32 *req, int replyBytes, u16 *u16reply, int maxwait, | 128 | u32 *req, int replyBytes, u16 *u16reply, int maxwait, |
@@ -351,7 +351,6 @@ mpt_reply(MPT_ADAPTER *ioc, u32 pa) | |||
351 | * mpt_interrupt - MPT adapter (IOC) specific interrupt handler. | 351 | * mpt_interrupt - MPT adapter (IOC) specific interrupt handler. |
352 | * @irq: irq number (not used) | 352 | * @irq: irq number (not used) |
353 | * @bus_id: bus identifier cookie == pointer to MPT_ADAPTER structure | 353 | * @bus_id: bus identifier cookie == pointer to MPT_ADAPTER structure |
354 | * @r: pt_regs pointer (not used) | ||
355 | * | 354 | * |
356 | * This routine is registered via the request_irq() kernel API call, | 355 | * This routine is registered via the request_irq() kernel API call, |
357 | * and handles all interrupts generated from a specific MPT adapter | 356 | * and handles all interrupts generated from a specific MPT adapter |
@@ -365,7 +364,7 @@ mpt_reply(MPT_ADAPTER *ioc, u32 pa) | |||
365 | * the protocol-specific details of the MPT request completion. | 364 | * the protocol-specific details of the MPT request completion. |
366 | */ | 365 | */ |
367 | static irqreturn_t | 366 | static irqreturn_t |
368 | mpt_interrupt(int irq, void *bus_id, struct pt_regs *r) | 367 | mpt_interrupt(int irq, void *bus_id) |
369 | { | 368 | { |
370 | MPT_ADAPTER *ioc = bus_id; | 369 | MPT_ADAPTER *ioc = bus_id; |
371 | u32 pa = CHIPREG_READ32_dmasync(&ioc->chip->ReplyFifo); | 370 | u32 pa = CHIPREG_READ32_dmasync(&ioc->chip->ReplyFifo); |
diff --git a/drivers/message/i2o/pci.c b/drivers/message/i2o/pci.c index dec41cc89937..62f1ac08332c 100644 --- a/drivers/message/i2o/pci.c +++ b/drivers/message/i2o/pci.c | |||
@@ -224,12 +224,11 @@ static int __devinit i2o_pci_alloc(struct i2o_controller *c) | |||
224 | * i2o_pci_interrupt - Interrupt handler for I2O controller | 224 | * i2o_pci_interrupt - Interrupt handler for I2O controller |
225 | * @irq: interrupt line | 225 | * @irq: interrupt line |
226 | * @dev_id: pointer to the I2O controller | 226 | * @dev_id: pointer to the I2O controller |
227 | * @r: pointer to registers | ||
228 | * | 227 | * |
229 | * Handle an interrupt from a PCI based I2O controller. This turns out | 228 | * Handle an interrupt from a PCI based I2O controller. This turns out |
230 | * to be rather simple. We keep the controller pointer in the cookie. | 229 | * to be rather simple. We keep the controller pointer in the cookie. |
231 | */ | 230 | */ |
232 | static irqreturn_t i2o_pci_interrupt(int irq, void *dev_id, struct pt_regs *r) | 231 | static irqreturn_t i2o_pci_interrupt(int irq, void *dev_id) |
233 | { | 232 | { |
234 | struct i2o_controller *c = dev_id; | 233 | struct i2o_controller *c = dev_id; |
235 | u32 m; | 234 | u32 m; |