aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2008-10-13 15:39:32 -0400
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2008-10-13 15:39:32 -0400
commit6b0da28b2d0f4f4e2c55689fc062db569075ff60 (patch)
treee7113f6db70fe3c2dd16bd2e7e1538fba4236c49 /include
parent67c56364df843fb9e3ed1af014b8fbe4b22ff25d (diff)
ide: add ide_retry_pc() helper
* Add ide_create_request_sense_cmd() and ide_retry_pc() helpers and convert ide-{atapi,floppy,tape}.c to use them. * Remove no longer used ide*_create_request_sense_cmd(), ide*_retry_pc() and 'retry_pc' argument from ide_pc_intr(). * Make ide_queue_pc_head() static. There should be no functional changes caused by this patch. Cc: Borislav Petkov <petkovbb@gmail.com> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'include')
-rw-r--r--include/linux/ide.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/include/linux/ide.h b/include/linux/ide.h
index 908b4fc9772c..d88cced0d02c 100644
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -1169,13 +1169,13 @@ enum {
1169 REQ_IDETAPE_WRITE = (1 << 3), 1169 REQ_IDETAPE_WRITE = (1 << 3),
1170}; 1170};
1171 1171
1172void ide_queue_pc_head(ide_drive_t *, struct gendisk *, struct ide_atapi_pc *,
1173 struct request *);
1174int ide_queue_pc_tail(ide_drive_t *, struct gendisk *, struct ide_atapi_pc *); 1172int ide_queue_pc_tail(ide_drive_t *, struct gendisk *, struct ide_atapi_pc *);
1175 1173
1176int ide_do_test_unit_ready(ide_drive_t *, struct gendisk *); 1174int ide_do_test_unit_ready(ide_drive_t *, struct gendisk *);
1177int ide_do_start_stop(ide_drive_t *, struct gendisk *, int); 1175int ide_do_start_stop(ide_drive_t *, struct gendisk *, int);
1178int ide_set_media_lock(ide_drive_t *, struct gendisk *, int); 1176int ide_set_media_lock(ide_drive_t *, struct gendisk *, int);
1177void ide_create_request_sense_cmd(ide_drive_t *, struct ide_atapi_pc *);
1178void ide_retry_pc(ide_drive_t *, struct gendisk *);
1179 1179
1180static inline unsigned long ide_scsi_get_timeout(struct ide_atapi_pc *pc) 1180static inline unsigned long ide_scsi_get_timeout(struct ide_atapi_pc *pc)
1181{ 1181{
@@ -1186,7 +1186,6 @@ int ide_scsi_expiry(ide_drive_t *);
1186 1186
1187ide_startstop_t ide_pc_intr(ide_drive_t *drive, ide_handler_t *handler, 1187ide_startstop_t ide_pc_intr(ide_drive_t *drive, ide_handler_t *handler,
1188 void (*update_buffers)(ide_drive_t *, struct ide_atapi_pc *), 1188 void (*update_buffers)(ide_drive_t *, struct ide_atapi_pc *),
1189 void (*retry_pc)(ide_drive_t *),
1190 int (*io_buffers)(ide_drive_t *, struct ide_atapi_pc *, unsigned int, 1189 int (*io_buffers)(ide_drive_t *, struct ide_atapi_pc *, unsigned int,
1191 int)); 1190 int));
1192ide_startstop_t ide_transfer_pc(ide_drive_t *, 1191ide_startstop_t ide_transfer_pc(ide_drive_t *,