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

Commit 8d2b450d authored by Mark Lord's avatar Mark Lord Committed by Jeff Garzik
Browse files

sata_mv: tidy up qc->tf usage in qc_prep() functions 



Tidy up qc->tf accesses in the mv_qc_prep() functions.

Signed-off-by: default avatarMark Lord <mlord@pobox.com>
Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
parent 20d92078

drivers/ata/sata_mv.c

+8 −10
Original line number Original line Diff line number Diff line
@@ -1898,17 +1898,17 @@ static void mv_qc_prep(struct ata_queued_cmd *qc) 
	struct ata_port *ap = qc->ap;

	struct ata_port *ap = qc->ap;

	struct mv_port_priv *pp = ap->private_data;

	struct mv_port_priv *pp = ap->private_data;

	__le16 *cw;

	__le16 *cw;

	struct ata_taskfile *tf;

	struct ata_taskfile *tf = &qc->tf;

	u16 flags = 0;

	u16 flags = 0;

	unsigned in_index;

	unsigned in_index;





	if ((qc->tf.protocol != ATA_PROT_DMA) &&

	if ((tf->protocol != ATA_PROT_DMA) &&

	    (qc->tf.protocol != ATA_PROT_NCQ))

	    (tf->protocol != ATA_PROT_NCQ))

		return;

		return;





	/* Fill in command request block

	/* Fill in command request block

	 */

	 */

	if (!(qc->tf.flags & ATA_TFLAG_WRITE))

	if (!(tf->flags & ATA_TFLAG_WRITE))

		flags |= CRQB_FLAG_READ;

		flags |= CRQB_FLAG_READ;

	WARN_ON(MV_MAX_Q_DEPTH <= qc->tag);

	WARN_ON(MV_MAX_Q_DEPTH <= qc->tag);

	flags |= qc->tag << CRQB_TAG_SHIFT;

	flags |= qc->tag << CRQB_TAG_SHIFT;
@@ -1924,7 +1924,6 @@ static void mv_qc_prep(struct ata_queued_cmd *qc) 
	pp->crqb[in_index].ctrl_flags = cpu_to_le16(flags);

	pp->crqb[in_index].ctrl_flags = cpu_to_le16(flags);





	cw = &pp->crqb[in_index].ata_cmd[0];

	cw = &pp->crqb[in_index].ata_cmd[0];

	tf = &qc->tf;





	/* Sadly, the CRQB cannot accomodate all registers--there are

	/* Sadly, the CRQB cannot accomodate all registers--there are

	 * only 11 bytes...so we must pick and choose required

	 * only 11 bytes...so we must pick and choose required
@@ -1990,16 +1989,16 @@ static void mv_qc_prep_iie(struct ata_queued_cmd *qc) 
	struct ata_port *ap = qc->ap;

	struct ata_port *ap = qc->ap;

	struct mv_port_priv *pp = ap->private_data;

	struct mv_port_priv *pp = ap->private_data;

	struct mv_crqb_iie *crqb;

	struct mv_crqb_iie *crqb;

	struct ata_taskfile *tf;

	struct ata_taskfile *tf = &qc->tf;

	unsigned in_index;

	unsigned in_index;

	u32 flags = 0;

	u32 flags = 0;





	if ((qc->tf.protocol != ATA_PROT_DMA) &&

	if ((tf->protocol != ATA_PROT_DMA) &&

	    (qc->tf.protocol != ATA_PROT_NCQ))

	    (tf->protocol != ATA_PROT_NCQ))

		return;

		return;





	/* Fill in Gen IIE command request block */

	/* Fill in Gen IIE command request block */

	if (!(qc->tf.flags & ATA_TFLAG_WRITE))

	if (!(tf->flags & ATA_TFLAG_WRITE))

		flags |= CRQB_FLAG_READ;

		flags |= CRQB_FLAG_READ;





	WARN_ON(MV_MAX_Q_DEPTH <= qc->tag);

	WARN_ON(MV_MAX_Q_DEPTH <= qc->tag);
@@ -2015,7 +2014,6 @@ static void mv_qc_prep_iie(struct ata_queued_cmd *qc) 
	crqb->addr_hi = cpu_to_le32((pp->sg_tbl_dma[qc->tag] >> 16) >> 16);

	crqb->addr_hi = cpu_to_le32((pp->sg_tbl_dma[qc->tag] >> 16) >> 16);

	crqb->flags = cpu_to_le32(flags);

	crqb->flags = cpu_to_le32(flags);





	tf = &qc->tf;

	crqb->ata_cmd[0] = cpu_to_le32(

	crqb->ata_cmd[0] = cpu_to_le32(

			(tf->command << 16) |

			(tf->command << 16) |

			(tf->feature << 24)

			(tf->feature << 24)