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

Commit 23ebda2f authored by Sebastian Andrzej Siewior's avatar Sebastian Andrzej Siewior Committed by Tejun Heo
Browse files

libata: remove ata_sff_data_xfer_noirq() 



ata_sff_data_xfer_noirq() is invoked via the ->sff_data_xfer hook. The
latter is invoked by ata_pio_sector(), atapi_send_cdb() and
__atapi_pio_bytes() which in turn is invoked by ata_sff_hsm_move().
The latter function requires that the "ap->lock" lock is held which
needs to be taken with disabled interrupts.

There is no need have to have ata_sff_data_xfer_noirq() which invokes
ata_sff_data_xfer32() with disabled interrupts because at this point the
interrupts are already disabled.
Remove the function and its references to it and replace all callers
with ata_sff_data_xfer32().

Signed-off-by: default avatarSebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: default avatarTejun Heo <tj@kernel.org>
parent aece27a2

Documentation/driver-api/libata.rst

+1 −2
Original line number Diff line number Diff line
@@ -118,8 +118,7 @@ PIO data read/write 
All bmdma-style drivers must implement this hook. This is the low-level

operation that actually copies the data bytes during a PIO data

transfer. Typically the driver will choose one of

:c:func:`ata_sff_data_xfer_noirq`, :c:func:`ata_sff_data_xfer`, or

:c:func:`ata_sff_data_xfer32`.

:c:func:`ata_sff_data_xfer`, or :c:func:`ata_sff_data_xfer32`.



ATA command execute

~~~~~~~~~~~~~~~~~~~

drivers/ata/libata-sff.c

+0 −30
Original line number Diff line number Diff line
@@ -657,36 +657,6 @@ unsigned int ata_sff_data_xfer32(struct ata_queued_cmd *qc, unsigned char *buf, 
}

EXPORT_SYMBOL_GPL(ata_sff_data_xfer32);



/**

 *	ata_sff_data_xfer_noirq - Transfer data by PIO

 *	@qc: queued command

 *	@buf: data buffer

 *	@buflen: buffer length

 *	@rw: read/write

 *

 *	Transfer data from/to the device data register by PIO. Do the

 *	transfer with interrupts disabled.

 *

 *	LOCKING:

 *	Inherited from caller.

 *

 *	RETURNS:

 *	Bytes consumed.

 */

unsigned int ata_sff_data_xfer_noirq(struct ata_queued_cmd *qc, unsigned char *buf,

				     unsigned int buflen, int rw)

{

	unsigned long flags;

	unsigned int consumed;



	local_irq_save(flags);

	consumed = ata_sff_data_xfer32(qc, buf, buflen, rw);

	local_irq_restore(flags);



	return consumed;

}

EXPORT_SYMBOL_GPL(ata_sff_data_xfer_noirq);



/**

 *	ata_pio_sector - Transfer a sector of data.

 *	@qc: Command on going

drivers/ata/pata_cmd640.c

+1 −1
Original line number Diff line number Diff line
@@ -178,7 +178,7 @@ static struct scsi_host_template cmd640_sht = { 
static struct ata_port_operations cmd640_port_ops = {

	.inherits	= &ata_sff_port_ops,

	/* In theory xfer_noirq is not needed once we kill the prefetcher */

	.sff_data_xfer	= ata_sff_data_xfer_noirq,

	.sff_data_xfer	= ata_sff_data_xfer32,

	.sff_irq_check	= cmd640_sff_irq_check,

	.qc_issue	= cmd640_qc_issue,

	.cable_detect	= ata_cable_40wire,

drivers/ata/pata_icside.c

+1 −1
Original line number Diff line number Diff line
@@ -324,7 +324,7 @@ 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_xfer_noirq,

	.sff_data_xfer		= ata_sff_data_xfer32,

	.bmdma_setup		= pata_icside_bmdma_setup,

	.bmdma_start		= pata_icside_bmdma_start,

	.bmdma_stop		= pata_icside_bmdma_stop,

drivers/ata/pata_imx.c

+1 −1
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ static struct scsi_host_template pata_imx_sht = { 


static struct ata_port_operations pata_imx_port_ops = {

	.inherits		= &ata_sff_port_ops,

	.sff_data_xfer		= ata_sff_data_xfer_noirq,

	.sff_data_xfer		= ata_sff_data_xfer32,

	.cable_detect		= ata_cable_unknown,

	.set_piomode		= pata_imx_set_piomode,

};