Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: 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

+2 -34
+1 -4
drivers/spi/spi-cadence-quadspi.c
··· 1441 1441 if (!(all_true || all_false)) 1442 1442 return false; 1443 1443 1444 - if (all_true) 1445 - return spi_mem_dtr_supports_op(mem, op); 1446 - else 1447 - return spi_mem_default_supports_op(mem, op); 1444 + return spi_mem_default_supports_op(mem, op); 1448 1445 } 1449 1446 1450 1447 static int cqspi_of_get_flash_pdata(struct platform_device *pdev,
-10
drivers/spi/spi-mem.c
··· 160 160 return true; 161 161 } 162 162 163 - bool spi_mem_dtr_supports_op(struct spi_mem *mem, 164 - const struct spi_mem_op *op) 165 - { 166 - if (op->cmd.nbytes != 2) 167 - return false; 168 - 169 - return spi_mem_check_buswidth(mem, op); 170 - } 171 - EXPORT_SYMBOL_GPL(spi_mem_dtr_supports_op); 172 - 173 163 bool spi_mem_default_supports_op(struct spi_mem *mem, 174 164 const struct spi_mem_op *op) 175 165 {
+1 -9
drivers/spi/spi-mxic.c
··· 335 335 static bool mxic_spi_mem_supports_op(struct spi_mem *mem, 336 336 const struct spi_mem_op *op) 337 337 { 338 - bool all_false; 339 - 340 338 if (op->data.buswidth > 8 || op->addr.buswidth > 8 || 341 339 op->dummy.buswidth > 8 || op->cmd.buswidth > 8) 342 340 return false; ··· 346 348 if (op->addr.nbytes > 7) 347 349 return false; 348 350 349 - all_false = !op->cmd.dtr && !op->addr.dtr && !op->dummy.dtr && 350 - !op->data.dtr; 351 - 352 - if (all_false) 353 - return spi_mem_default_supports_op(mem, op); 354 - else 355 - return spi_mem_dtr_supports_op(mem, op); 351 + return spi_mem_default_supports_op(mem, op); 356 352 } 357 353 358 354 static int mxic_spi_mem_exec_op(struct spi_mem *mem,
-11
include/linux/spi/spi-mem.h
··· 330 330 331 331 bool spi_mem_default_supports_op(struct spi_mem *mem, 332 332 const struct spi_mem_op *op); 333 - 334 - bool spi_mem_dtr_supports_op(struct spi_mem *mem, 335 - const struct spi_mem_op *op); 336 - 337 333 #else 338 334 static inline int 339 335 spi_controller_dma_map_mem_op_data(struct spi_controller *ctlr, ··· 349 353 static inline 350 354 bool spi_mem_default_supports_op(struct spi_mem *mem, 351 355 const struct spi_mem_op *op) 352 - { 353 - return false; 354 - } 355 - 356 - static inline 357 - bool spi_mem_dtr_supports_op(struct spi_mem *mem, 358 - const struct spi_mem_op *op) 359 356 { 360 357 return false; 361 358 }