iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mtd: rawnand: make subop helpers return unsigned values

Browse Source 
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>
This commit is contained in:
Miquel Raynal 2018-07-19 00:09:12 +02:00
parent d166541e90
commit 760c435e0f
2 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
drivers/mtd/nand/raw/nand_base.c
View File

@ -2668,8 +2668,8 @@ static bool nand_subop_instr_is_valid(const struct nand_subop *subop,
return subop && instr_idx < subop->ninstrs; return subop && instr_idx < subop->ninstrs;
} }
static int nand_subop_get_start_off(const struct nand_subop *subop, static unsigned int nand_subop_get_start_off(const struct nand_subop *subop,
unsigned int instr_idx) unsigned int instr_idx)
{ {
if (instr_idx) if (instr_idx)
return 0; 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. * 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 nand_subop_get_addr_start_off(const struct nand_subop *subop,
unsigned int instr_idx) unsigned int instr_idx)
{ {
if (!nand_subop_instr_is_valid(subop, instr_idx) || if (WARN_ON(!nand_subop_instr_is_valid(subop, instr_idx) ||
subop->instrs[instr_idx].type != NAND_OP_ADDR_INSTR) subop->instrs[instr_idx].type != NAND_OP_ADDR_INSTR))
return -EINVAL; return 0;
return nand_subop_get_start_off(subop, instr_idx); 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. * 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 nand_subop_get_num_addr_cyc(const struct nand_subop *subop,
unsigned int instr_idx) unsigned int instr_idx)
{ {
int start_off, end_off; int start_off, end_off;
if (!nand_subop_instr_is_valid(subop, instr_idx) || if (WARN_ON(!nand_subop_instr_is_valid(subop, instr_idx) ||
subop->instrs[instr_idx].type != NAND_OP_ADDR_INSTR) subop->instrs[instr_idx].type != NAND_OP_ADDR_INSTR))
return -EINVAL; return 0;
start_off = nand_subop_get_addr_start_off(subop, instr_idx); 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. * Given a data instruction, returns the offset to start from.
*/ */
int nand_subop_get_data_start_off(const struct nand_subop *subop, unsigned int nand_subop_get_data_start_off(const struct nand_subop *subop,
unsigned int instr_idx) unsigned int instr_idx)
{ {
if (!nand_subop_instr_is_valid(subop, instr_idx) || if (WARN_ON(!nand_subop_instr_is_valid(subop, instr_idx) ||
!nand_instr_is_data(&subop->instrs[instr_idx])) !nand_instr_is_data(&subop->instrs[instr_idx])))
return -EINVAL; return 0;
return nand_subop_get_start_off(subop, instr_idx); 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. * Returns the length of the chunk of data to send/receive.
*/ */
int nand_subop_get_data_len(const struct nand_subop *subop, unsigned int nand_subop_get_data_len(const struct nand_subop *subop,
unsigned int instr_idx) unsigned int instr_idx)
{ {
int start_off = 0, end_off; int start_off = 0, end_off;
if (!nand_subop_instr_is_valid(subop, instr_idx) || if (WARN_ON(!nand_subop_instr_is_valid(subop, instr_idx) ||
!nand_instr_is_data(&subop->instrs[instr_idx])) !nand_instr_is_data(&subop->instrs[instr_idx])))
return -EINVAL; return 0;
start_off = nand_subop_get_data_start_off(subop, instr_idx); start_off = nand_subop_get_data_start_off(subop, instr_idx);

16
include/linux/mtd/rawnand.h
View File

@ -1007,14 +1007,14 @@ struct nand_subop {
unsigned int last_instr_end_off; unsigned int last_instr_end_off;
}; };
int nand_subop_get_addr_start_off(const struct nand_subop *subop, unsigned int nand_subop_get_addr_start_off(const struct nand_subop *subop,
unsigned int op_id); unsigned int op_id);
int nand_subop_get_num_addr_cyc(const struct nand_subop *subop, unsigned int nand_subop_get_num_addr_cyc(const struct nand_subop *subop,
unsigned int op_id); unsigned int op_id);
int nand_subop_get_data_start_off(const struct nand_subop *subop, unsigned int nand_subop_get_data_start_off(const struct nand_subop *subop,
unsigned int op_id); unsigned int op_id);
int nand_subop_get_data_len(const struct nand_subop *subop, unsigned int nand_subop_get_data_len(const struct nand_subop *subop,
unsigned int op_id); unsigned int op_id);
/** /**
* struct nand_op_parser_addr_constraints - Constraints for address instructions * struct nand_op_parser_addr_constraints - Constraints for address instructions