From: Alexander Dahl Date: Wed, 15 Jan 2025 16:16:21 +0000 (+0100) Subject: Revert "mem: spi-mem: add declaration for spi_mem_default_supports_op" X-Git-Tag: v2025.04-rc1~29^2 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1d6d6c16b9b1e3442065448aa6215ce1316dc476;p=pandora-u-boot.git Revert "mem: spi-mem: add declaration for spi_mem_default_supports_op" 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 --- 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);