Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b5632303 authored by Tejun Heo's avatar Tejun Heo Committed by Jeff Garzik
Browse files

[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: default avatarTejun Heo <htejun@gmail.com>
Signed-off-by: default avatarJeff Garzik <jgarzik@pobox.com>
parent 82033adf

drivers/scsi/libata-core.c

+2 −12
Original line number Original line Diff line number Diff line
@@ -3503,7 +3503,7 @@ struct ata_queued_cmd *ata_qc_new_init(struct ata_port *ap, 
static void __ata_qc_complete(struct ata_queued_cmd *qc)

static void __ata_qc_complete(struct ata_queued_cmd *qc)

{

{

	struct ata_port *ap = qc->ap;

	struct ata_port *ap = qc->ap;

	unsigned int tag, do_clear = 0;

	unsigned int tag;





	qc->flags = 0;

	qc->flags = 0;

	tag = qc->tag;

	tag = qc->tag;
@@ -3511,18 +3511,9 @@ static void __ata_qc_complete(struct ata_queued_cmd *qc) 
		if (tag == ap->active_tag)

		if (tag == ap->active_tag)

			ap->active_tag = ATA_TAG_POISON;

			ap->active_tag = ATA_TAG_POISON;

		qc->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);

		clear_bit(tag, &ap->qactive);

	}

	}

}





/**

/**

 *	ata_qc_free - free unused ata_queued_cmd

 *	ata_qc_free - free unused ata_queued_cmd
@@ -3537,7 +3528,6 @@ static void __ata_qc_complete(struct ata_queued_cmd *qc) 
void ata_qc_free(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 != NULL);	/* ata_qc_from_tag _might_ return NULL */

	assert(qc->waiting == NULL);	/* nothing should be waiting */





	__ata_qc_complete(qc);

	__ata_qc_complete(qc);

}

}

include/linux/libata.h

+0 −2
Original line number Original line Diff line number Diff line
@@ -285,8 +285,6 @@ struct ata_queued_cmd { 




	ata_qc_cb_t		complete_fn;

	ata_qc_cb_t		complete_fn;





	struct completion	*waiting;



	void			*private_data;

	void			*private_data;

};

};