From: Miquel Raynal <miquel.raynal@bootlin.com>
To: Richard Weinberger <richard@nod.at>,
Vignesh Raghavendra <vigneshr@ti.com>,
Tudor Ambarus <Tudor.Ambarus@microchip.com>,
Pratyush Yadav <p.yadav@ti.com>, Michael Walle <michael@walle.cc>,
<linux-mtd@lists.infradead.org>, Mark Brown <broonie@kernel.org>,
<linux-spi@vger.kernel.org>
Cc: Julien Su <juliensu@mxic.com.tw>,
Jaime Liao <jaimeliao@mxic.com.tw>,
Thomas Petazzoni <thomas.petazzoni@bootlin.com>,
Boris Brezillon <boris.brezillon@collabora.com>,
Xiangsheng Hou <xiangsheng.hou@mediatek.com>,
Miquel Raynal <miquel.raynal@bootlin.com>
Subject: [PATCH v9 05/13] spi: spi-mem: Kill the spi_mem_dtr_supports_op() helper
Date: Tue, 4 Jan 2022 09:36:23 +0100 [thread overview]
Message-ID: <20220104083631.40776-6-miquel.raynal@bootlin.com> (raw)
In-Reply-To: <20220104083631.40776-1-miquel.raynal@bootlin.com>
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>
---
drivers/spi/spi-cadence-quadspi.c | 5 +----
drivers/spi/spi-mem.c | 10 ----------
drivers/spi/spi-mxic.c | 10 +---------
include/linux/spi/spi-mem.h | 11 -----------
4 files changed, 2 insertions(+), 34 deletions(-)
diff --git a/drivers/spi/spi-cadence-quadspi.c b/drivers/spi/spi-cadence-quadspi.c
index 6705bbca12a6..21291876e3cc 100644
--- a/drivers/spi/spi-cadence-quadspi.c
+++ b/drivers/spi/spi-cadence-quadspi.c
@@ -1252,10 +1252,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,
diff --git a/drivers/spi/spi-mem.c b/drivers/spi/spi-mem.c
index 86e6597bc3dc..ed966d8129eb 100644
--- a/drivers/spi/spi-mem.c
+++ b/drivers/spi/spi-mem.c
@@ -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)
{
diff --git a/drivers/spi/spi-mxic.c b/drivers/spi/spi-mxic.c
index 9952fcdf3627..6bec0a7c77d3 100644
--- a/drivers/spi/spi-mxic.c
+++ b/drivers/spi/spi-mxic.c
@@ -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);
+ return spi_mem_default_supports_op(mem, op);
}
static int mxic_spi_mem_exec_op(struct spi_mem *mem,
diff --git a/include/linux/spi/spi-mem.h b/include/linux/spi/spi-mem.h
index 38e5d45c9842..4a1bfe689872 100644
--- a/include/linux/spi/spi-mem.h
+++ b/include/linux/spi/spi-mem.h
@@ -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);
--
2.27.0
______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/
next prev parent reply other threads:[~2022-01-04 8:39 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-04 8:36 [PATCH v9 00/13] External ECC engines & Macronix support Miquel Raynal
2022-01-04 8:36 ` [PATCH v9 01/13] spi: spi-mem: Introduce a capability structure Miquel Raynal
2022-01-05 5:52 ` Pratyush Yadav
2022-01-26 10:53 ` Miquel Raynal
2022-01-26 16:35 ` Mark Brown
2022-01-26 17:36 ` Miquel Raynal
2022-01-26 17:41 ` Mark Brown
2022-01-27 9:20 ` Miquel Raynal
2022-01-27 9:37 ` Miquel Raynal
2022-01-04 8:36 ` [PATCH v9 02/13] spi: spi-mem: Check the controller extra capabilities Miquel Raynal
2022-01-05 5:53 ` Pratyush Yadav
2022-01-26 10:53 ` Miquel Raynal
2022-01-04 8:36 ` [PATCH v9 03/13] spi: cadence-quadspi: Provide a capability structure Miquel Raynal
2022-01-26 10:53 ` Miquel Raynal
2022-01-04 8:36 ` [PATCH v9 04/13] spi: mxic: " Miquel Raynal
2022-01-26 10:53 ` Miquel Raynal
2022-01-04 8:36 ` Miquel Raynal [this message]
2022-01-26 10:53 ` [PATCH v9 05/13] spi: spi-mem: Kill the spi_mem_dtr_supports_op() helper Miquel Raynal
2022-01-04 8:36 ` [PATCH v9 06/13] spi: spi-mem: Add an ecc parameter to the spi_mem_op structure Miquel Raynal
2022-01-04 9:02 ` Boris Brezillon
2022-01-04 9:24 ` Miquel Raynal
2022-01-26 10:53 ` Miquel Raynal
2022-01-04 8:36 ` [PATCH v9 07/13] mtd: spinand: Delay a little bit the dirmap creation Miquel Raynal
2022-01-26 10:53 ` Miquel Raynal
2022-01-04 8:36 ` [PATCH v9 08/13] mtd: spinand: Create direct mapping descriptors for ECC operations Miquel Raynal
2022-01-26 10:52 ` Miquel Raynal
2022-01-04 8:36 ` [PATCH v9 09/13] spi: mxic: Fix the transmit path Miquel Raynal
2022-01-26 10:52 ` Miquel Raynal
2022-01-04 8:36 ` [PATCH v9 10/13] spi: mxic: Create a helper to configure the controller before an operation Miquel Raynal
2022-01-26 10:52 ` Miquel Raynal
2022-01-04 8:36 ` [PATCH v9 11/13] spi: mxic: Create a helper to ease the start of " Miquel Raynal
2022-01-26 10:52 ` Miquel Raynal
2022-01-04 8:36 ` [PATCH v9 12/13] spi: mxic: Add support for direct mapping Miquel Raynal
2022-01-26 10:52 ` Miquel Raynal
2022-01-04 8:36 ` [PATCH v9 13/13] spi: mxic: Add support for pipelined ECC operations Miquel Raynal
2022-01-26 10:52 ` Miquel Raynal
2022-01-04 9:04 ` [PATCH v9 00/13] External ECC engines & Macronix support Boris Brezillon
2022-01-23 16:01 ` Miquel Raynal
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220104083631.40776-6-miquel.raynal@bootlin.com \
--to=miquel.raynal@bootlin.com \
--cc=Tudor.Ambarus@microchip.com \
--cc=boris.brezillon@collabora.com \
--cc=broonie@kernel.org \
--cc=jaimeliao@mxic.com.tw \
--cc=juliensu@mxic.com.tw \
--cc=linux-mtd@lists.infradead.org \
--cc=linux-spi@vger.kernel.org \
--cc=michael@walle.cc \
--cc=p.yadav@ti.com \
--cc=richard@nod.at \
--cc=thomas.petazzoni@bootlin.com \
--cc=vigneshr@ti.com \
--cc=xiangsheng.hou@mediatek.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).