[PATCH v2 2/2] Revert "mem: spi-mem: add declaration for spi_mem_default_supports_op"
Alexander Dahl
ada at thorsis.com
Wed Jan 15 17:16:21 CET 2025
We have a duplicate declaration of spi_mem_default_supports_op() which
was added twice, first with commit af6266c1c27a ("mem: spi-mem: add
declaration for spi_mem_default_supports_op") for v2021.04, and again
with commit 2299076e34f8 ("spi: spi-mem: export
spi_mem_default_supports_op()") for v2021.07.
The first commit is reverted here, because the second better matches the
definition and has a better place in the declaration order.
Note: Linux declares this in a different section of spi-mem.h which is
disabled in U-Boot through `#ifndef __UBOOT__`.
This reverts commit af6266c1c27add8beac7f3365c00b3525a9012c4.
Signed-off-by: Alexander Dahl <ada at thorsis.com>
---
Cc: Mathew McBride <matt at traverse.com.au>
Cc: Pratyush Yadav <p.yadav at ti.com>
Cc: Priyanka Jain <priyanka.jain at nxp.com>
Cc: Sean Anderson <seanga2 at gmail.com>
Cc: Jagan Teki <jagan at amarulasolutions.com>
include/spi-mem.h | 3 ---
1 file changed, 3 deletions(-)
diff --git a/include/spi-mem.h b/include/spi-mem.h
index 3c8e95b6f53..2eb05a2e5bc 100644
--- a/include/spi-mem.h
+++ b/include/spi-mem.h
@@ -329,9 +329,6 @@ bool spi_mem_default_supports_op(struct spi_slave *slave,
int spi_mem_exec_op(struct spi_slave *slave, const struct spi_mem_op *op);
-bool spi_mem_default_supports_op(struct spi_slave *mem,
- const struct spi_mem_op *op);
-
struct spi_mem_dirmap_desc *
spi_mem_dirmap_create(struct spi_slave *mem,
const struct spi_mem_dirmap_info *info);
--
2.39.5
More information about the U-Boot
mailing list