Commit b4082450 authored by Damien Le Moal's avatar Damien Le Moal
Browse files

ata: libata: Remove ata_noop_qc_prep() 



The function ata_noop_qc_prep(), as its name implies, does nothing and
simply returns AC_ERR_OK. For drivers that do not need any special
preparations of queued commands, we can avoid having to define struct
ata_port qc_prep operation by simply testing if that operation is
defined or not in ata_qc_issue(). Make this change and remove
ata_noop_qc_prep().

Signed-off-by: default avatarDamien Le Moal <dlemoal@kernel.org>
Reviewed-by: default avatarJohn Garry <john.g.garry@oracle.com>
Reviewed-by: default avatarSergey Shtylyov <s.shtylyov@omp.ru>
parent 73eb8249

drivers/ata/libata-core.c

+7 −11
Original line number Diff line number Diff line
@@ -4696,12 +4696,6 @@ int ata_std_qc_defer(struct ata_queued_cmd *qc) 
}

EXPORT_SYMBOL_GPL(ata_std_qc_defer);



enum ata_completion_errors ata_noop_qc_prep(struct ata_queued_cmd *qc)

{

	return AC_ERR_OK;

}

EXPORT_SYMBOL_GPL(ata_noop_qc_prep);



/**

 *	ata_sg_init - Associate command with scatter-gather table.

 *	@qc: Command to be associated
@@ -5088,10 +5082,13 @@ void ata_qc_issue(struct ata_queued_cmd *qc) 
		return;

	}



	if (ap->ops->qc_prep) {

		trace_ata_qc_prep(qc);

		qc->err_mask |= ap->ops->qc_prep(qc);

		if (unlikely(qc->err_mask))

			goto err;

	}



	trace_ata_qc_issue(qc);

	qc->err_mask |= ap->ops->qc_issue(qc);

	if (unlikely(qc->err_mask))
@@ -6724,7 +6721,6 @@ static void ata_dummy_error_handler(struct ata_port *ap) 
}



struct ata_port_operations ata_dummy_port_ops = {

	.qc_prep		= ata_noop_qc_prep,

	.qc_issue		= ata_dummy_qc_issue,

	.error_handler		= ata_dummy_error_handler,

	.sched_eh		= ata_std_sched_eh,

drivers/ata/libata-sff.c

+0 −1
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ static struct workqueue_struct *ata_sff_wq; 
const struct ata_port_operations ata_sff_port_ops = {

	.inherits		= &ata_base_port_ops,



	.qc_prep		= ata_noop_qc_prep,

	.qc_issue		= ata_sff_qc_issue,

	.qc_fill_rtf		= ata_sff_qc_fill_rtf,

drivers/ata/pata_ep93xx.c

+0 −2
Original line number Diff line number Diff line
@@ -884,8 +884,6 @@ static const struct scsi_host_template ep93xx_pata_sht = { 
static struct ata_port_operations ep93xx_pata_port_ops = {

	.inherits		= &ata_bmdma_port_ops,



	.qc_prep		= ata_noop_qc_prep,



	.softreset		= ep93xx_pata_softreset,

	.hardreset		= ATA_OP_NULL,

drivers/ata/pata_icside.c

+0 −2
Original line number Diff line number Diff line
@@ -328,8 +328,6 @@ static void pata_icside_postreset(struct ata_link *link, unsigned int *classes) 


static struct ata_port_operations pata_icside_port_ops = {

	.inherits		= &ata_bmdma_port_ops,

	/* no need to build any PRD tables for DMA */

	.qc_prep		= ata_noop_qc_prep,

	.sff_data_xfer		= ata_sff_data_xfer32,

	.bmdma_setup		= pata_icside_bmdma_setup,

	.bmdma_start		= pata_icside_bmdma_start,

drivers/ata/pata_mpc52xx.c

+0 −1
Original line number Diff line number Diff line
@@ -620,7 +620,6 @@ static struct ata_port_operations mpc52xx_ata_port_ops = { 
	.bmdma_start		= mpc52xx_bmdma_start,

	.bmdma_stop		= mpc52xx_bmdma_stop,

	.bmdma_status		= mpc52xx_bmdma_status,

	.qc_prep		= ata_noop_qc_prep,

};



static int mpc52xx_ata_init_one(struct device *dev,