Skip to content

Commit

Permalink
[PATCH] libata: remove unused qc->waiting
Browse files Browse the repository at this point in the history
There is no user of qc->waiting left after ata_exec_internal()
changes.  Kill the field.

Signed-off-by: Tejun Heo <htejun@gmail.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
  • Loading branch information
Tejun Heo authored and Jeff Garzik committed Dec 13, 2005
1 parent 82033ad commit b563230
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 14 deletions.
14 changes: 2 additions & 12 deletions drivers/scsi/libata-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -3503,25 +3503,16 @@ struct ata_queued_cmd *ata_qc_new_init(struct ata_port *ap,
static void __ata_qc_complete(struct ata_queued_cmd *qc)
{
struct ata_port *ap = qc->ap;
unsigned int tag, do_clear = 0;
unsigned int tag;

qc->flags = 0;
tag = qc->tag;
if (likely(ata_tag_valid(tag))) {
if (tag == ap->active_tag)
ap->active_tag = ATA_TAG_POISON;
qc->tag = ATA_TAG_POISON;
do_clear = 1;
}

if (qc->waiting) {
struct completion *waiting = qc->waiting;
qc->waiting = NULL;
complete(waiting);
}

if (likely(do_clear))
clear_bit(tag, &ap->qactive);
}
}

/**
Expand All @@ -3537,7 +3528,6 @@ static void __ata_qc_complete(struct ata_queued_cmd *qc)
void ata_qc_free(struct ata_queued_cmd *qc)
{
assert(qc != NULL); /* ata_qc_from_tag _might_ return NULL */
assert(qc->waiting == NULL); /* nothing should be waiting */

__ata_qc_complete(qc);
}
Expand Down
2 changes: 0 additions & 2 deletions include/linux/libata.h
Original file line number Diff line number Diff line change
Expand Up @@ -285,8 +285,6 @@ struct ata_queued_cmd {

ata_qc_cb_t complete_fn;

struct completion *waiting;

void *private_data;
};

Expand Down

0 comments on commit b563230

Please sign in to comment.