summaryrefslogtreecommitdiffstats
path: root/include/linux/ide.h
diff options
context:
space:
mode:
authorBorislav Petkov <petkovbb@gmail.com>2009-01-02 16:12:53 +0100
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2009-01-02 16:12:53 +0100
commit4cad085efbce8dcc5006b0d1034089758b4fc7ba (patch)
treef9aeb0e7eec115e56aada920eefa40b093aec434 /include/linux/ide.h
parent5f25843fa79b7c35097b0ffe8b2c5cc2428d6495 (diff)
downloadop-kernel-dev-4cad085efbce8dcc5006b0d1034089758b4fc7ba.zip
op-kernel-dev-4cad085efbce8dcc5006b0d1034089758b4fc7ba.tar.gz
ide-cd: move cdrom_timer_expiry to ide-atapi.c
- cdrom_timer_expiry -> ide_cd_expiry - remove expiry-arg to ide_issue_pc as it is redundant now - ide_debug_log -> debug_log Signed-off-by: Borislav Petkov <petkovbb@gmail.com> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'include/linux/ide.h')
-rw-r--r--include/linux/ide.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/include/linux/ide.h b/include/linux/ide.h
index e35ff68..e20e0b5 100644
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -396,6 +396,7 @@ enum {
* This is used for several packet commands (not for READ/WRITE commands).
*/
#define IDE_PC_BUFFER_SIZE 256
+#define ATAPI_WAIT_PC (60 * HZ)
struct ide_atapi_pc {
/* actual packet bytes */
@@ -1253,10 +1254,11 @@ static inline unsigned long ide_scsi_get_timeout(struct ide_atapi_pc *pc)
}
int ide_scsi_expiry(ide_drive_t *);
+int ide_cd_expiry(ide_drive_t *);
int ide_cd_get_xferlen(struct request *);
-ide_startstop_t ide_issue_pc(ide_drive_t *, unsigned int, ide_expiry_t *);
+ide_startstop_t ide_issue_pc(ide_drive_t *, unsigned int);
ide_startstop_t do_rw_taskfile(ide_drive_t *, ide_task_t *);
OpenPOWER on IntegriCloud