]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
spi: intel: make mem_ops comparison unique to opcode match
authorRaag Jadav <raag.jadav@intel.com>
Fri, 17 Nov 2023 14:40:53 +0000 (20:10 +0530)
committerMark Brown <broonie@kernel.org>
Sat, 18 Nov 2023 12:36:34 +0000 (12:36 +0000)
Instead of comparing parameters for every supported mem_ops, only compare
on opcode match, which is relatively more efficient.

Signed-off-by: Raag Jadav <raag.jadav@intel.com>
Reviewed-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Link: https://lore.kernel.org/r/20231117144053.24005-1-raag.jadav@intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
drivers/spi/spi-intel.c

index 98ec4dc22b81a22d9bc7cd69900fe63904b4e4a3..3654ae35d2db6f1ef3f568cdc2290e9d7d1b40cc 100644 (file)
@@ -711,8 +711,7 @@ static bool intel_spi_cmp_mem_op(const struct intel_spi_mem_op *iop,
 {
        if (iop->mem_op.cmd.nbytes != op->cmd.nbytes ||
            iop->mem_op.cmd.buswidth != op->cmd.buswidth ||
-           iop->mem_op.cmd.dtr != op->cmd.dtr ||
-           iop->mem_op.cmd.opcode != op->cmd.opcode)
+           iop->mem_op.cmd.dtr != op->cmd.dtr)
                return false;
 
        if (iop->mem_op.addr.nbytes != op->addr.nbytes ||
@@ -737,11 +736,12 @@ intel_spi_match_mem_op(struct intel_spi *ispi, const struct spi_mem_op *op)
        const struct intel_spi_mem_op *iop;
 
        for (iop = ispi->mem_ops; iop->mem_op.cmd.opcode; iop++) {
-               if (intel_spi_cmp_mem_op(iop, op))
-                       break;
+               if (iop->mem_op.cmd.opcode == op->cmd.opcode &&
+                   intel_spi_cmp_mem_op(iop, op))
+                       return iop;
        }
 
-       return iop->mem_op.cmd.opcode ? iop : NULL;
+       return NULL;
 }
 
 static bool intel_spi_supports_mem_op(struct spi_mem *mem,