summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTejun Heo <htejun@gmail.com>2005-12-13 14:50:38 +0900
committerJeff Garzik <jgarzik@pobox.com>2005-12-13 01:34:45 -0500
commit82033adf0a4b26eb0c0c90e224848431e2a59bc6 (patch)
treeb995909cbf2de7dca994db13de3f157ace164905
parenta012370322eafee642369784ff71afe81f5a8592 (diff)
downloadop-kernel-dev-82033adf0a4b26eb0c0c90e224848431e2a59bc6.zip
op-kernel-dev-82033adf0a4b26eb0c0c90e224848431e2a59bc6.tar.gz
[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>
-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 0107036..1c4dbf3 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,
return AC_ERR_OTHER;
}
-static int ata_qc_wait_err(struct ata_queued_cmd *qc,
- struct completion *wait)
-{
- int rc = 0;
-
- if (wait_for_completion_timeout(wait, 30 * HZ) < 1) {
- /* timeout handling */
- qc->err_mask |= ac_err_mask(ata_chk_status(qc->ap));
-
- if (!qc->err_mask) {
- printk(KERN_WARNING "ata%u: slow completion (cmd %x)\n",
- qc->ap->id, qc->tf.command);
- } else {
- printk(KERN_WARNING "ata%u: qc timeout (cmd %x)\n",
- qc->ap->id, qc->tf.command);
- rc = -EIO;
- }
-
- ata_qc_complete(qc);
- }
-
- return rc;
-}
-
/**
* ata_dev_identify - obtain IDENTIFY x DEVICE page
* @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,
return qc;
}
-int ata_qc_complete_noop(struct ata_queued_cmd *qc)
-{
- return 0;
-}
-
static void __ata_qc_complete(struct ata_queued_cmd *qc)
{
struct ata_port *ap = qc->ap;
diff --git a/drivers/scsi/libata.h b/drivers/scsi/libata.h
index 686255d..251e53b 100644
--- a/drivers/scsi/libata.h
+++ b/drivers/scsi/libata.h
@@ -39,7 +39,6 @@ struct ata_scsi_args {
/* libata-core.c */
extern int atapi_enabled;
-extern int ata_qc_complete_noop(struct ata_queued_cmd *qc);
extern struct ata_queued_cmd *ata_qc_new_init(struct ata_port *ap,
struct ata_device *dev);
extern void ata_rwcmd_protocol(struct ata_queued_cmd *qc);
OpenPOWER on IntegriCloud