aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi
diff options
context:
space:
mode:
authorTejun Heo <htejun@gmail.com>2005-12-13 00:50:38 -0500
committerJeff Garzik <jgarzik@pobox.com>2005-12-13 01:34:45 -0500
commit82033adf0a4b26eb0c0c90e224848431e2a59bc6 (patch)
treeb995909cbf2de7dca994db13de3f157ace164905 /drivers/scsi
parenta012370322eafee642369784ff71afe81f5a8592 (diff)
[PATCH] libata: remove unused functions
There is no user of ata_qc_wait_err() and ata_qc_complete_noop() after ata_exec_internal() changes. Remove unused functions. Signed-off-by: Tejun Heo <htejun@gmail.com> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
Diffstat (limited to 'drivers/scsi')
-rw-r--r--drivers/scsi/libata-core.c29
-rw-r--r--drivers/scsi/libata.h1
2 files changed, 0 insertions, 30 deletions
diff --git a/drivers/scsi/libata-core.c b/drivers/scsi/libata-core.c
index 01070366bb19..1c4dbf3e9818 100644
--- a/drivers/scsi/libata-core.c
+++ b/drivers/scsi/libata-core.c
@@ -1145,30 +1145,6 @@ ata_exec_internal(struct ata_port *ap, struct ata_device *dev,
1145 return AC_ERR_OTHER; 1145 return AC_ERR_OTHER;
1146} 1146}
1147 1147
1148static int ata_qc_wait_err(struct ata_queued_cmd *qc,
1149 struct completion *wait)
1150{
1151 int rc = 0;
1152
1153 if (wait_for_completion_timeout(wait, 30 * HZ) < 1) {
1154 /* timeout handling */
1155 qc->err_mask |= ac_err_mask(ata_chk_status(qc->ap));
1156
1157 if (!qc->err_mask) {
1158 printk(KERN_WARNING "ata%u: slow completion (cmd %x)\n",
1159 qc->ap->id, qc->tf.command);
1160 } else {
1161 printk(KERN_WARNING "ata%u: qc timeout (cmd %x)\n",
1162 qc->ap->id, qc->tf.command);
1163 rc = -EIO;
1164 }
1165
1166 ata_qc_complete(qc);
1167 }
1168
1169 return rc;
1170}
1171
1172/** 1148/**
1173 * ata_dev_identify - obtain IDENTIFY x DEVICE page 1149 * ata_dev_identify - obtain IDENTIFY x DEVICE page
1174 * @ap: port on which device we wish to probe resides 1150 * @ap: port on which device we wish to probe resides
@@ -3524,11 +3500,6 @@ struct ata_queued_cmd *ata_qc_new_init(struct ata_port *ap,
3524 return qc; 3500 return qc;
3525} 3501}
3526 3502
3527int ata_qc_complete_noop(struct ata_queued_cmd *qc)
3528{
3529 return 0;
3530}
3531
3532static void __ata_qc_complete(struct ata_queued_cmd *qc) 3503static void __ata_qc_complete(struct ata_queued_cmd *qc)
3533{ 3504{
3534 struct ata_port *ap = qc->ap; 3505 struct ata_port *ap = qc->ap;
diff --git a/drivers/scsi/libata.h b/drivers/scsi/libata.h
index 686255df76b8..251e53bdc6e0 100644
--- a/drivers/scsi/libata.h
+++ b/drivers/scsi/libata.h
@@ -39,7 +39,6 @@ struct ata_scsi_args {
39 39
40/* libata-core.c */ 40/* libata-core.c */
41extern int atapi_enabled; 41extern int atapi_enabled;
42extern int ata_qc_complete_noop(struct ata_queued_cmd *qc);
43extern struct ata_queued_cmd *ata_qc_new_init(struct ata_port *ap, 42extern struct ata_queued_cmd *ata_qc_new_init(struct ata_port *ap,
44 struct ata_device *dev); 43 struct ata_device *dev);
45extern void ata_rwcmd_protocol(struct ata_queued_cmd *qc); 44extern void ata_rwcmd_protocol(struct ata_queued_cmd *qc);