Commit 931139af authored by Damien Le Moal's avatar Damien Le Moal
Browse files

ata: libata: simplify qc_fill_rtf port operation interface 



The boolean return value of the qc_fill_rtf operation is used nowhere.
Simplify this operation interface by making it a void function. All
drivers defining this operation are also updated.

Signed-off-by: default avatarDamien Le Moal <damien.lemoal@opensource.wdc.com>
Signed-off-by: default avatarNiklas Cassel <niklas.cassel@wdc.com>
Reviewed-by: default avatarJohn Garry <john.g.garry@oracle.com>
parent 87629312

drivers/ata/acard-ahci.c

+2 −4
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ struct acard_sg { 
};



static enum ata_completion_errors acard_ahci_qc_prep(struct ata_queued_cmd *qc);

static bool acard_ahci_qc_fill_rtf(struct ata_queued_cmd *qc);

static void acard_ahci_qc_fill_rtf(struct ata_queued_cmd *qc);

static int acard_ahci_port_start(struct ata_port *ap);

static int acard_ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent);
@@ -248,7 +248,7 @@ static enum ata_completion_errors acard_ahci_qc_prep(struct ata_queued_cmd *qc) 
	return AC_ERR_OK;

}



static bool acard_ahci_qc_fill_rtf(struct ata_queued_cmd *qc)

static void acard_ahci_qc_fill_rtf(struct ata_queued_cmd *qc)

{

	struct ahci_port_priv *pp = qc->ap->private_data;

	u8 *rx_fis = pp->rx_fis;
@@ -268,8 +268,6 @@ static bool acard_ahci_qc_fill_rtf(struct ata_queued_cmd *qc) 
		qc->result_tf.status = (rx_fis + RX_FIS_PIO_SETUP)[15];

	} else

		ata_tf_from_fis(rx_fis + RX_FIS_D2H_REG, &qc->result_tf);



	return true;

}



static int acard_ahci_port_start(struct ata_port *ap)

drivers/ata/libahci.c

+2 −4
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ static ssize_t ahci_transmit_led_message(struct ata_port *ap, u32 state, 


static int ahci_scr_read(struct ata_link *link, unsigned int sc_reg, u32 *val);

static int ahci_scr_write(struct ata_link *link, unsigned int sc_reg, u32 val);

static bool ahci_qc_fill_rtf(struct ata_queued_cmd *qc);

static void ahci_qc_fill_rtf(struct ata_queued_cmd *qc);

static int ahci_port_start(struct ata_port *ap);

static void ahci_port_stop(struct ata_port *ap);

static enum ata_completion_errors ahci_qc_prep(struct ata_queued_cmd *qc);
@@ -2053,7 +2053,7 @@ unsigned int ahci_qc_issue(struct ata_queued_cmd *qc) 
}

EXPORT_SYMBOL_GPL(ahci_qc_issue);



static bool ahci_qc_fill_rtf(struct ata_queued_cmd *qc)

static void ahci_qc_fill_rtf(struct ata_queued_cmd *qc)

{

	struct ahci_port_priv *pp = qc->ap->private_data;

	u8 *rx_fis = pp->rx_fis;
@@ -2087,8 +2087,6 @@ static bool ahci_qc_fill_rtf(struct ata_queued_cmd *qc) 
		qc->result_tf.error = fis[3];

	} else

		ata_tf_from_fis(rx_fis + RX_FIS_D2H_REG, &qc->result_tf);



	return true;

}



static void ahci_freeze(struct ata_port *ap)

drivers/ata/libata-sff.c

+1 −5
Original line number Diff line number Diff line
@@ -1377,14 +1377,10 @@ EXPORT_SYMBOL_GPL(ata_sff_qc_issue); 
 *

 *	LOCKING:

 *	spin_lock_irqsave(host lock)

 *

 *	RETURNS:

 *	true indicating that result TF is successfully filled.

 */

bool ata_sff_qc_fill_rtf(struct ata_queued_cmd *qc)

void ata_sff_qc_fill_rtf(struct ata_queued_cmd *qc)

{

	qc->ap->ops->sff_tf_read(qc->ap, &qc->result_tf);

	return true;

}

EXPORT_SYMBOL_GPL(ata_sff_qc_fill_rtf);

drivers/ata/sata_fsl.c

+1 −2
Original line number Diff line number Diff line
@@ -566,7 +566,7 @@ static unsigned int sata_fsl_qc_issue(struct ata_queued_cmd *qc) 
	return 0;

}



static bool sata_fsl_qc_fill_rtf(struct ata_queued_cmd *qc)

static void sata_fsl_qc_fill_rtf(struct ata_queued_cmd *qc)

{

	struct sata_fsl_port_priv *pp = qc->ap->private_data;

	struct sata_fsl_host_priv *host_priv = qc->ap->host->private_data;
@@ -577,7 +577,6 @@ static bool sata_fsl_qc_fill_rtf(struct ata_queued_cmd *qc) 
	cd = pp->cmdentry + tag;



	ata_tf_from_fis(cd->sfis, &qc->result_tf);

	return true;

}



static int sata_fsl_scr_write(struct ata_link *link,

drivers/ata/sata_inic162x.c

+5 −7
Original line number Diff line number Diff line
@@ -566,7 +566,7 @@ static void inic_tf_read(struct ata_port *ap, struct ata_taskfile *tf) 
	tf->status	= readb(port_base + PORT_TF_COMMAND);

}



static bool inic_qc_fill_rtf(struct ata_queued_cmd *qc)

static void inic_qc_fill_rtf(struct ata_queued_cmd *qc)

{

	struct ata_taskfile *rtf = &qc->result_tf;

	struct ata_taskfile tf;
@@ -580,12 +580,10 @@ static bool inic_qc_fill_rtf(struct ata_queued_cmd *qc) 
	 */

	inic_tf_read(qc->ap, &tf);



	if (!(tf.status & ATA_ERR))

		return false;



	if (tf.status & ATA_ERR) {

		rtf->status = tf.status;

		rtf->error = tf.error;

	return true;

	}

}



static void inic_freeze(struct ata_port *ap)