diff options
Diffstat (limited to 'drivers/block/cciss.c')
-rw-r--r-- | drivers/block/cciss.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c index 36b88f6c5f82..dcccaf2782f3 100644 --- a/drivers/block/cciss.c +++ b/drivers/block/cciss.c | |||
@@ -130,7 +130,7 @@ static struct board_type products[] = { | |||
130 | static ctlr_info_t *hba[MAX_CTLR]; | 130 | static ctlr_info_t *hba[MAX_CTLR]; |
131 | 131 | ||
132 | static void do_cciss_request(request_queue_t *q); | 132 | static void do_cciss_request(request_queue_t *q); |
133 | static irqreturn_t do_cciss_intr(int irq, void *dev_id, struct pt_regs *regs); | 133 | static irqreturn_t do_cciss_intr(int irq, void *dev_id); |
134 | static int cciss_open(struct inode *inode, struct file *filep); | 134 | static int cciss_open(struct inode *inode, struct file *filep); |
135 | static int cciss_release(struct inode *inode, struct file *filep); | 135 | static int cciss_release(struct inode *inode, struct file *filep); |
136 | static int cciss_ioctl(struct inode *inode, struct file *filep, | 136 | static int cciss_ioctl(struct inode *inode, struct file *filep, |
@@ -2300,7 +2300,7 @@ static int sendcmd(__u8 cmd, int ctlr, void *buff, size_t size, unsigned int use | |||
2300 | #ifdef CONFIG_CISS_SCSI_TAPE | 2300 | #ifdef CONFIG_CISS_SCSI_TAPE |
2301 | /* if we saved some commands for later, process them now. */ | 2301 | /* if we saved some commands for later, process them now. */ |
2302 | if (info_p->scsi_rejects.ncompletions > 0) | 2302 | if (info_p->scsi_rejects.ncompletions > 0) |
2303 | do_cciss_intr(0, info_p, NULL); | 2303 | do_cciss_intr(0, info_p); |
2304 | #endif | 2304 | #endif |
2305 | cmd_free(info_p, c, 1); | 2305 | cmd_free(info_p, c, 1); |
2306 | return status; | 2306 | return status; |
@@ -2652,7 +2652,7 @@ static inline long interrupt_not_for_us(ctlr_info_t *h) | |||
2652 | #endif | 2652 | #endif |
2653 | } | 2653 | } |
2654 | 2654 | ||
2655 | static irqreturn_t do_cciss_intr(int irq, void *dev_id, struct pt_regs *regs) | 2655 | static irqreturn_t do_cciss_intr(int irq, void *dev_id) |
2656 | { | 2656 | { |
2657 | ctlr_info_t *h = dev_id; | 2657 | ctlr_info_t *h = dev_id; |
2658 | CommandList_struct *c; | 2658 | CommandList_struct *c; |