aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorBorislav Petkov <petkovbb@googlemail.com>2009-01-02 10:12:54 -0500
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2009-01-02 10:12:54 -0500
commit5d655a03b847fbe5353a8a74bbeb75e18708dca3 (patch)
tree5162f30fcea1c2d43f479eb243b91762f821efaf /include/linux
parent5fe3110431ccf437607bdc11ac3677bf3eeee6e3 (diff)
ide-atapi: remove ide-scsi remnants from ide_pc_intr()
As a result, remove now unused ide_scsi_get_timeout and ide_scsi_expiry. Signed-off-by: Borislav Petkov <petkovbb@gmail.com> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/ide.h6
1 files changed, 0 insertions, 6 deletions
diff --git a/include/linux/ide.h b/include/linux/ide.h
index e20e0b5c1739..257524ee1af2 100644
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -1248,12 +1248,6 @@ int ide_set_media_lock(ide_drive_t *, struct gendisk *, int);
1248void ide_create_request_sense_cmd(ide_drive_t *, struct ide_atapi_pc *); 1248void ide_create_request_sense_cmd(ide_drive_t *, struct ide_atapi_pc *);
1249void ide_retry_pc(ide_drive_t *, struct gendisk *); 1249void ide_retry_pc(ide_drive_t *, struct gendisk *);
1250 1250
1251static inline unsigned long ide_scsi_get_timeout(struct ide_atapi_pc *pc)
1252{
1253 return max_t(unsigned long, WAIT_CMD, pc->timeout - jiffies);
1254}
1255
1256int ide_scsi_expiry(ide_drive_t *);
1257int ide_cd_expiry(ide_drive_t *); 1251int ide_cd_expiry(ide_drive_t *);
1258 1252
1259int ide_cd_get_xferlen(struct request *); 1253int ide_cd_get_xferlen(struct request *);