Skip to content

Commit

Permalink
spi: spi-mem: Kill the spi_mem_dtr_supports_op() helper
Browse files Browse the repository at this point in the history
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: Miquel Raynal <miquel.raynal@bootlin.com>
Reviewed-by: Pratyush Yadav <p.yadav@ti.com>
Reviewed-by: Boris Brezillon <boris.brezillon@collabora.com>
Reviewed-by: Tudor Ambarus <tudor.ambarus@microchip.com>
Link: https://lore.kernel.org/linux-mtd/20220127091808.1043392-6-miquel.raynal@bootlin.com
  • Loading branch information
Miquel Raynal committed Feb 10, 2022
1 parent 0e450c7 commit 9a15efc
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 34 deletions.
5 changes: 1 addition & 4 deletions drivers/spi/spi-cadence-quadspi.c
Original file line number Diff line number Diff line change
Expand Up @@ -1441,10 +1441,7 @@ 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);
return spi_mem_default_supports_op(mem, op);
}

static int cqspi_of_get_flash_pdata(struct platform_device *pdev,
Expand Down
10 changes: 0 additions & 10 deletions drivers/spi/spi-mem.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down
10 changes: 1 addition & 9 deletions drivers/spi/spi-mxic.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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);
return spi_mem_default_supports_op(mem, op);
}

static int mxic_spi_mem_exec_op(struct spi_mem *mem,
Expand Down
11 changes: 0 additions & 11 deletions include/linux/spi/spi-mem.h
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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);
Expand Down

0 comments on commit 9a15efc

Please sign in to comment.