Commit 9a15efc5 authored by Miquel Raynal's avatar Miquel Raynal
Browse files

spi: spi-mem: Kill the spi_mem_dtr_supports_op() helper 



Now that spi_mem_default_supports_op() has access to the static
controller capabilities (relating to memory operations), and now that
these capabilities have been filled by the relevant controllers, there
is no need for a specific helper checking only DTR operations, so let's
just kill spi_mem_dtr_supports_op() and simply use
spi_mem_default_supports_op() instead.

Signed-off-by: default avatarMiquel Raynal <miquel.raynal@bootlin.com>
Reviewed-by: default avatarPratyush Yadav <p.yadav@ti.com>
Reviewed-by: default avatarBoris Brezillon <boris.brezillon@collabora.com>
Reviewed-by: default avatarTudor Ambarus <tudor.ambarus@microchip.com>
Link: https://lore.kernel.org/linux-mtd/20220127091808.1043392-6-miquel.raynal@bootlin.com
parent 0e450c7c

drivers/spi/spi-cadence-quadspi.c

+1 −4
Original line number Diff line number Diff line
@@ -1441,9 +1441,6 @@ static bool cqspi_supports_mem_op(struct spi_mem *mem, 
	if (!(all_true || all_false))

		return false;



	if (all_true)

		return spi_mem_dtr_supports_op(mem, op);

	else

	return spi_mem_default_supports_op(mem, op);

}

drivers/spi/spi-mem.c

+0 −10
Original line number Diff line number Diff line
@@ -160,16 +160,6 @@ static bool spi_mem_check_buswidth(struct spi_mem *mem, 
	return true;

}



bool spi_mem_dtr_supports_op(struct spi_mem *mem,

			     const struct spi_mem_op *op)

{

	if (op->cmd.nbytes != 2)

		return false;



	return spi_mem_check_buswidth(mem, op);

}

EXPORT_SYMBOL_GPL(spi_mem_dtr_supports_op);



bool spi_mem_default_supports_op(struct spi_mem *mem,

				 const struct spi_mem_op *op)

{

drivers/spi/spi-mxic.c

+1 −9
Original line number Diff line number Diff line
@@ -335,8 +335,6 @@ static int mxic_spi_data_xfer(struct mxic_spi *mxic, const void *txbuf, 
static bool mxic_spi_mem_supports_op(struct spi_mem *mem,

				     const struct spi_mem_op *op)

{

	bool all_false;



	if (op->data.buswidth > 8 || op->addr.buswidth > 8 ||

	    op->dummy.buswidth > 8 || op->cmd.buswidth > 8)

		return false;
@@ -348,13 +346,7 @@ static bool mxic_spi_mem_supports_op(struct spi_mem *mem, 
	if (op->addr.nbytes > 7)

		return false;



	all_false = !op->cmd.dtr && !op->addr.dtr && !op->dummy.dtr &&

		    !op->data.dtr;



	if (all_false)

	return spi_mem_default_supports_op(mem, op);

	else

		return spi_mem_dtr_supports_op(mem, op);

}



static int mxic_spi_mem_exec_op(struct spi_mem *mem,

include/linux/spi/spi-mem.h

+0 −11
Original line number Diff line number Diff line
@@ -330,10 +330,6 @@ void spi_controller_dma_unmap_mem_op_data(struct spi_controller *ctlr, 


bool spi_mem_default_supports_op(struct spi_mem *mem,

				 const struct spi_mem_op *op);



bool spi_mem_dtr_supports_op(struct spi_mem *mem,

			     const struct spi_mem_op *op);



#else

static inline int

spi_controller_dma_map_mem_op_data(struct spi_controller *ctlr,
@@ -356,13 +352,6 @@ bool spi_mem_default_supports_op(struct spi_mem *mem, 
{

	return false;

}



static inline

bool spi_mem_dtr_supports_op(struct spi_mem *mem,

			     const struct spi_mem_op *op)

{

	return false;

}

#endif /* CONFIG_SPI_MEM */



int spi_mem_adjust_op_size(struct spi_mem *mem, struct spi_mem_op *op);