mtd: rawnand: make subop helpers return unsigned values

A report from Colin Ian King pointed a CoverityScan issue where error
values on these helpers where not checked in the drivers. These
helpers can error out only in case of a software bug in driver code,
not because of a runtime/hardware error. Hence, let's WARN_ON() in this
case and return 0 which is harmless anyway.

Fixes: 8878b126df76 ("mtd: nand: add ->exec_op() implementation")
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
Reviewed-by: Boris Brezillon <boris.brezillon@bootlin.com>
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>

diff --git a/drivers/mtd/nand/raw/nand_base.c b/drivers/mtd/nand/raw/nand_base.c
index c4b74630f4c57f74bb971cb2415e720ef67a64ef..ef10beab99f5e59a82a5767d7181538dbc89796e 100644 (file)
--- a/drivers/mtd/nand/raw/nand_base.c
+++ b/drivers/mtd/nand/raw/nand_base.c
@@ -2668,8 +2668,8 @@ static bool nand_subop_instr_is_valid(const struct nand_subop *subop,
        return subop && instr_idx < subop->ninstrs;
 }
 
-static int nand_subop_get_start_off(const struct nand_subop *subop,
-                                   unsigned int instr_idx)
+static unsigned int nand_subop_get_start_off(const struct nand_subop *subop,
+                                            unsigned int instr_idx)
 {
        if (instr_idx)
                return 0;
@@ -2688,12 +2688,12 @@ static int nand_subop_get_start_off(const struct nand_subop *subop,
  *
  * Given an address instruction, returns the offset of the first cycle to issue.
  */
-int nand_subop_get_addr_start_off(const struct nand_subop *subop,
-                                 unsigned int instr_idx)
+unsigned int nand_subop_get_addr_start_off(const struct nand_subop *subop,
+                                          unsigned int instr_idx)
 {
-       if (!nand_subop_instr_is_valid(subop, instr_idx) ||
-           subop->instrs[instr_idx].type != NAND_OP_ADDR_INSTR)
-               return -EINVAL;
+       if (WARN_ON(!nand_subop_instr_is_valid(subop, instr_idx) ||
+                   subop->instrs[instr_idx].type != NAND_OP_ADDR_INSTR))
+               return 0;
 
        return nand_subop_get_start_off(subop, instr_idx);
 }
@@ -2710,14 +2710,14 @@ EXPORT_SYMBOL_GPL(nand_subop_get_addr_start_off);
  *
  * Given an address instruction, returns the number of address cycle to issue.
  */
-int nand_subop_get_num_addr_cyc(const struct nand_subop *subop,
-                               unsigned int instr_idx)
+unsigned int nand_subop_get_num_addr_cyc(const struct nand_subop *subop,
+                                        unsigned int instr_idx)
 {
        int start_off, end_off;
 
-       if (!nand_subop_instr_is_valid(subop, instr_idx) ||
-           subop->instrs[instr_idx].type != NAND_OP_ADDR_INSTR)
-               return -EINVAL;
+       if (WARN_ON(!nand_subop_instr_is_valid(subop, instr_idx) ||
+                   subop->instrs[instr_idx].type != NAND_OP_ADDR_INSTR))
+               return 0;
 
        start_off = nand_subop_get_addr_start_off(subop, instr_idx);
 
@@ -2742,12 +2742,12 @@ EXPORT_SYMBOL_GPL(nand_subop_get_num_addr_cyc);
  *
  * Given a data instruction, returns the offset to start from.
  */
-int nand_subop_get_data_start_off(const struct nand_subop *subop,
-                                 unsigned int instr_idx)
+unsigned int nand_subop_get_data_start_off(const struct nand_subop *subop,
+                                          unsigned int instr_idx)
 {
-       if (!nand_subop_instr_is_valid(subop, instr_idx) ||
-           !nand_instr_is_data(&subop->instrs[instr_idx]))
-               return -EINVAL;
+       if (WARN_ON(!nand_subop_instr_is_valid(subop, instr_idx) ||
+                   !nand_instr_is_data(&subop->instrs[instr_idx])))
+               return 0;
 
        return nand_subop_get_start_off(subop, instr_idx);
 }
@@ -2764,14 +2764,14 @@ EXPORT_SYMBOL_GPL(nand_subop_get_data_start_off);
  *
  * Returns the length of the chunk of data to send/receive.
  */
-int nand_subop_get_data_len(const struct nand_subop *subop,
-                           unsigned int instr_idx)
+unsigned int nand_subop_get_data_len(const struct nand_subop *subop,
+                                    unsigned int instr_idx)
 {
        int start_off = 0, end_off;
 
-       if (!nand_subop_instr_is_valid(subop, instr_idx) ||
-           !nand_instr_is_data(&subop->instrs[instr_idx]))
-               return -EINVAL;
+       if (WARN_ON(!nand_subop_instr_is_valid(subop, instr_idx) ||
+                   !nand_instr_is_data(&subop->instrs[instr_idx])))
+               return 0;
 
        start_off = nand_subop_get_data_start_off(subop, instr_idx);
 

diff --git a/include/linux/mtd/rawnand.h b/include/linux/mtd/rawnand.h
index f60fad29eae686848a2a3261f8d2899590145f0e..598d356de83f58b06d0421d5f8e3f30f7f1f09ed 100644 (file)
--- a/include/linux/mtd/rawnand.h
+++ b/include/linux/mtd/rawnand.h
@@ -1007,14 +1007,14 @@ struct nand_subop {
        unsigned int last_instr_end_off;
 };
 
-int nand_subop_get_addr_start_off(const struct nand_subop *subop,
-                                 unsigned int op_id);
-int nand_subop_get_num_addr_cyc(const struct nand_subop *subop,
-                               unsigned int op_id);
-int nand_subop_get_data_start_off(const struct nand_subop *subop,
-                                 unsigned int op_id);
-int nand_subop_get_data_len(const struct nand_subop *subop,
-                           unsigned int op_id);
+unsigned int nand_subop_get_addr_start_off(const struct nand_subop *subop,
+                                          unsigned int op_id);
+unsigned int nand_subop_get_num_addr_cyc(const struct nand_subop *subop,
+                                        unsigned int op_id);
+unsigned int nand_subop_get_data_start_off(const struct nand_subop *subop,
+                                          unsigned int op_id);
+unsigned int nand_subop_get_data_len(const struct nand_subop *subop,
+                                    unsigned int op_id);
 
 /**
  * struct nand_op_parser_addr_constraints - Constraints for address instructions