diff options
Diffstat (limited to 'drivers/ide')
-rw-r--r-- | drivers/ide/ide-cd.c | 4 | ||||
-rw-r--r-- | drivers/ide/ide-disk.c | 4 | ||||
-rw-r--r-- | drivers/ide/ide-io.c | 2 | ||||
-rw-r--r-- | drivers/ide/ide-probe.c | 2 | ||||
-rw-r--r-- | drivers/ide/legacy/hd.c | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c index 1486eb212ccc..ca843522f91d 100644 --- a/drivers/ide/ide-cd.c +++ b/drivers/ide/ide-cd.c | |||
@@ -3071,7 +3071,7 @@ static inline void ide_cdrom_add_settings(ide_drive_t *drive) { ; } | |||
3071 | /* | 3071 | /* |
3072 | * standard prep_rq_fn that builds 10 byte cmds | 3072 | * standard prep_rq_fn that builds 10 byte cmds |
3073 | */ | 3073 | */ |
3074 | static int ide_cdrom_prep_fs(request_queue_t *q, struct request *rq) | 3074 | static int ide_cdrom_prep_fs(struct request_queue *q, struct request *rq) |
3075 | { | 3075 | { |
3076 | int hard_sect = queue_hardsect_size(q); | 3076 | int hard_sect = queue_hardsect_size(q); |
3077 | long block = (long)rq->hard_sector / (hard_sect >> 9); | 3077 | long block = (long)rq->hard_sector / (hard_sect >> 9); |
@@ -3137,7 +3137,7 @@ static int ide_cdrom_prep_pc(struct request *rq) | |||
3137 | return BLKPREP_OK; | 3137 | return BLKPREP_OK; |
3138 | } | 3138 | } |
3139 | 3139 | ||
3140 | static int ide_cdrom_prep_fn(request_queue_t *q, struct request *rq) | 3140 | static int ide_cdrom_prep_fn(struct request_queue *q, struct request *rq) |
3141 | { | 3141 | { |
3142 | if (blk_fs_request(rq)) | 3142 | if (blk_fs_request(rq)) |
3143 | return ide_cdrom_prep_fs(q, rq); | 3143 | return ide_cdrom_prep_fs(q, rq); |
diff --git a/drivers/ide/ide-disk.c b/drivers/ide/ide-disk.c index b1304a7f3e0a..5ce4216f72a2 100644 --- a/drivers/ide/ide-disk.c +++ b/drivers/ide/ide-disk.c | |||
@@ -679,7 +679,7 @@ static ide_proc_entry_t idedisk_proc[] = { | |||
679 | }; | 679 | }; |
680 | #endif /* CONFIG_IDE_PROC_FS */ | 680 | #endif /* CONFIG_IDE_PROC_FS */ |
681 | 681 | ||
682 | static void idedisk_prepare_flush(request_queue_t *q, struct request *rq) | 682 | static void idedisk_prepare_flush(struct request_queue *q, struct request *rq) |
683 | { | 683 | { |
684 | ide_drive_t *drive = q->queuedata; | 684 | ide_drive_t *drive = q->queuedata; |
685 | 685 | ||
@@ -697,7 +697,7 @@ static void idedisk_prepare_flush(request_queue_t *q, struct request *rq) | |||
697 | rq->buffer = rq->cmd; | 697 | rq->buffer = rq->cmd; |
698 | } | 698 | } |
699 | 699 | ||
700 | static int idedisk_issue_flush(request_queue_t *q, struct gendisk *disk, | 700 | static int idedisk_issue_flush(struct request_queue *q, struct gendisk *disk, |
701 | sector_t *error_sector) | 701 | sector_t *error_sector) |
702 | { | 702 | { |
703 | ide_drive_t *drive = q->queuedata; | 703 | ide_drive_t *drive = q->queuedata; |
diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c index 484c50e71446..aa9f5f0b1e67 100644 --- a/drivers/ide/ide-io.c +++ b/drivers/ide/ide-io.c | |||
@@ -1327,7 +1327,7 @@ static void ide_do_request (ide_hwgroup_t *hwgroup, int masked_irq) | |||
1327 | /* | 1327 | /* |
1328 | * Passes the stuff to ide_do_request | 1328 | * Passes the stuff to ide_do_request |
1329 | */ | 1329 | */ |
1330 | void do_ide_request(request_queue_t *q) | 1330 | void do_ide_request(struct request_queue *q) |
1331 | { | 1331 | { |
1332 | ide_drive_t *drive = q->queuedata; | 1332 | ide_drive_t *drive = q->queuedata; |
1333 | 1333 | ||
diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c index 5a4c5ea12f89..3a2a9a338fd9 100644 --- a/drivers/ide/ide-probe.c +++ b/drivers/ide/ide-probe.c | |||
@@ -945,7 +945,7 @@ static void save_match(ide_hwif_t *hwif, ide_hwif_t *new, ide_hwif_t **match) | |||
945 | */ | 945 | */ |
946 | static int ide_init_queue(ide_drive_t *drive) | 946 | static int ide_init_queue(ide_drive_t *drive) |
947 | { | 947 | { |
948 | request_queue_t *q; | 948 | struct request_queue *q; |
949 | ide_hwif_t *hwif = HWIF(drive); | 949 | ide_hwif_t *hwif = HWIF(drive); |
950 | int max_sectors = 256; | 950 | int max_sectors = 256; |
951 | int max_sg_entries = PRD_ENTRIES; | 951 | int max_sg_entries = PRD_ENTRIES; |
diff --git a/drivers/ide/legacy/hd.c b/drivers/ide/legacy/hd.c index 8f2db8dd35f7..8e05d88e81ba 100644 --- a/drivers/ide/legacy/hd.c +++ b/drivers/ide/legacy/hd.c | |||
@@ -652,7 +652,7 @@ repeat: | |||
652 | } | 652 | } |
653 | } | 653 | } |
654 | 654 | ||
655 | static void do_hd_request (request_queue_t * q) | 655 | static void do_hd_request (struct request_queue * q) |
656 | { | 656 | { |
657 | disable_irq(HD_IRQ); | 657 | disable_irq(HD_IRQ); |
658 | hd_request(); | 658 | hd_request(); |