diff options
author | Tejun Heo <htejun@gmail.com> | 2005-12-13 00:51:25 -0500 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-12-13 01:34:46 -0500 |
commit | b5632303401c231bf270ef36f1013e52caf4caf9 (patch) | |
tree | 671b2a1d0d32d30d935535440ce4e57fdff3a709 /drivers/scsi | |
parent | 82033adf0a4b26eb0c0c90e224848431e2a59bc6 (diff) |
[PATCH] libata: remove unused qc->waiting
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>
Diffstat (limited to 'drivers/scsi')
-rw-r--r-- | drivers/scsi/libata-core.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/drivers/scsi/libata-core.c b/drivers/scsi/libata-core.c index 1c4dbf3e9818..9ea102587914 100644 --- a/drivers/scsi/libata-core.c +++ b/drivers/scsi/libata-core.c | |||
@@ -3503,7 +3503,7 @@ struct ata_queued_cmd *ata_qc_new_init(struct ata_port *ap, | |||
3503 | static void __ata_qc_complete(struct ata_queued_cmd *qc) | 3503 | static void __ata_qc_complete(struct ata_queued_cmd *qc) |
3504 | { | 3504 | { |
3505 | struct ata_port *ap = qc->ap; | 3505 | struct ata_port *ap = qc->ap; |
3506 | unsigned int tag, do_clear = 0; | 3506 | unsigned int tag; |
3507 | 3507 | ||
3508 | qc->flags = 0; | 3508 | qc->flags = 0; |
3509 | tag = qc->tag; | 3509 | tag = qc->tag; |
@@ -3511,17 +3511,8 @@ static void __ata_qc_complete(struct ata_queued_cmd *qc) | |||
3511 | if (tag == ap->active_tag) | 3511 | if (tag == ap->active_tag) |
3512 | ap->active_tag = ATA_TAG_POISON; | 3512 | ap->active_tag = ATA_TAG_POISON; |
3513 | qc->tag = ATA_TAG_POISON; | 3513 | qc->tag = ATA_TAG_POISON; |
3514 | do_clear = 1; | ||
3515 | } | ||
3516 | |||
3517 | if (qc->waiting) { | ||
3518 | struct completion *waiting = qc->waiting; | ||
3519 | qc->waiting = NULL; | ||
3520 | complete(waiting); | ||
3521 | } | ||
3522 | |||
3523 | if (likely(do_clear)) | ||
3524 | clear_bit(tag, &ap->qactive); | 3514 | clear_bit(tag, &ap->qactive); |
3515 | } | ||
3525 | } | 3516 | } |
3526 | 3517 | ||
3527 | /** | 3518 | /** |
@@ -3537,7 +3528,6 @@ static void __ata_qc_complete(struct ata_queued_cmd *qc) | |||
3537 | void ata_qc_free(struct ata_queued_cmd *qc) | 3528 | void ata_qc_free(struct ata_queued_cmd *qc) |
3538 | { | 3529 | { |
3539 | assert(qc != NULL); /* ata_qc_from_tag _might_ return NULL */ | 3530 | assert(qc != NULL); /* ata_qc_from_tag _might_ return NULL */ |
3540 | assert(qc->waiting == NULL); /* nothing should be waiting */ | ||
3541 | 3531 | ||
3542 | __ata_qc_complete(qc); | 3532 | __ata_qc_complete(qc); |
3543 | } | 3533 | } |