projects
/
linux-block.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
3d24b2a
)
spi: spi-mem: Compute length only when needed
author
Tudor Ambarus
<tudor.ambarus@microchip.com>
Fri, 28 Feb 2020 16:07:44 +0000
(16:07 +0000)
committer
Mark Brown
<broonie@kernel.org>
Fri, 28 Feb 2020 18:17:18 +0000
(18:17 +0000)
When adjust_op_size is defined, len is never used. Move the len
computation where it's actually used.
Signed-off-by: Tudor Ambarus <tudor.ambarus@microchip.com>
Link:
https://lore.kernel.org/r/20200228160735.1565047-1-tudor.ambarus@microchip.com
Signed-off-by: Mark Brown <broonie@kernel.org>
drivers/spi/spi-mem.c
patch
|
blob
|
blame
|
history
diff --git
a/drivers/spi/spi-mem.c
b/drivers/spi/spi-mem.c
index 3c46747bacb125af0aba05d16997bcff59ac889e..adaa0c49f966da97cebd5547449018d491bc9a59 100644
(file)
--- a/
drivers/spi/spi-mem.c
+++ b/
drivers/spi/spi-mem.c
@@
-418,12
+418,13
@@
int spi_mem_adjust_op_size(struct spi_mem *mem, struct spi_mem_op *op)
struct spi_controller *ctlr = mem->spi->controller;
size_t len;
- len = sizeof(op->cmd.opcode) + op->addr.nbytes + op->dummy.nbytes;
-
if (ctlr->mem_ops && ctlr->mem_ops->adjust_op_size)
return ctlr->mem_ops->adjust_op_size(mem, op);
if (!ctlr->mem_ops || !ctlr->mem_ops->exec_op) {
+ len = sizeof(op->cmd.opcode) + op->addr.nbytes +
+ op->dummy.nbytes;
+
if (len > spi_max_transfer_size(mem->spi))
return -EINVAL;