diff options
Diffstat (limited to 'drivers/block/cciss.c')
-rw-r--r-- | drivers/block/cciss.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c index a2d6612b80d2..1be82d544dc3 100644 --- a/drivers/block/cciss.c +++ b/drivers/block/cciss.c | |||
@@ -139,7 +139,7 @@ static struct board_type products[] = { | |||
139 | 139 | ||
140 | static ctlr_info_t *hba[MAX_CTLR]; | 140 | static ctlr_info_t *hba[MAX_CTLR]; |
141 | 141 | ||
142 | static void do_cciss_request(request_queue_t *q); | 142 | static void do_cciss_request(struct request_queue *q); |
143 | static irqreturn_t do_cciss_intr(int irq, void *dev_id); | 143 | static irqreturn_t do_cciss_intr(int irq, void *dev_id); |
144 | static int cciss_open(struct inode *inode, struct file *filep); | 144 | static int cciss_open(struct inode *inode, struct file *filep); |
145 | static int cciss_release(struct inode *inode, struct file *filep); | 145 | static int cciss_release(struct inode *inode, struct file *filep); |
@@ -1584,7 +1584,7 @@ static int deregister_disk(struct gendisk *disk, drive_info_struct *drv, | |||
1584 | */ | 1584 | */ |
1585 | if (h->gendisk[0] != disk) { | 1585 | if (h->gendisk[0] != disk) { |
1586 | if (disk) { | 1586 | if (disk) { |
1587 | request_queue_t *q = disk->queue; | 1587 | struct request_queue *q = disk->queue; |
1588 | if (disk->flags & GENHD_FL_UP) | 1588 | if (disk->flags & GENHD_FL_UP) |
1589 | del_gendisk(disk); | 1589 | del_gendisk(disk); |
1590 | if (q) { | 1590 | if (q) { |
@@ -2511,7 +2511,7 @@ after_error_processing: | |||
2511 | /* | 2511 | /* |
2512 | * Get a request and submit it to the controller. | 2512 | * Get a request and submit it to the controller. |
2513 | */ | 2513 | */ |
2514 | static void do_cciss_request(request_queue_t *q) | 2514 | static void do_cciss_request(struct request_queue *q) |
2515 | { | 2515 | { |
2516 | ctlr_info_t *h = q->queuedata; | 2516 | ctlr_info_t *h = q->queuedata; |
2517 | CommandList_struct *c; | 2517 | CommandList_struct *c; |
@@ -3380,7 +3380,7 @@ static int __devinit cciss_init_one(struct pci_dev *pdev, | |||
3380 | do { | 3380 | do { |
3381 | drive_info_struct *drv = &(hba[i]->drv[j]); | 3381 | drive_info_struct *drv = &(hba[i]->drv[j]); |
3382 | struct gendisk *disk = hba[i]->gendisk[j]; | 3382 | struct gendisk *disk = hba[i]->gendisk[j]; |
3383 | request_queue_t *q; | 3383 | struct request_queue *q; |
3384 | 3384 | ||
3385 | /* Check if the disk was allocated already */ | 3385 | /* Check if the disk was allocated already */ |
3386 | if (!disk){ | 3386 | if (!disk){ |
@@ -3523,7 +3523,7 @@ static void __devexit cciss_remove_one(struct pci_dev *pdev) | |||
3523 | for (j = 0; j < CISS_MAX_LUN; j++) { | 3523 | for (j = 0; j < CISS_MAX_LUN; j++) { |
3524 | struct gendisk *disk = hba[i]->gendisk[j]; | 3524 | struct gendisk *disk = hba[i]->gendisk[j]; |
3525 | if (disk) { | 3525 | if (disk) { |
3526 | request_queue_t *q = disk->queue; | 3526 | struct request_queue *q = disk->queue; |
3527 | 3527 | ||
3528 | if (disk->flags & GENHD_FL_UP) | 3528 | if (disk->flags & GENHD_FL_UP) |
3529 | del_gendisk(disk); | 3529 | del_gendisk(disk); |