2024-01-24 03:07:42

by David Regan

Subject: [PATCH v3 08/10] mtd: rawnand: brcmnand: exec_op helper functions return type fixes

fix return type for exec_op reset and status detect helper functions

Reported-by: Dan Carpenter <[email protected]>
Closes: http://lists.infradead.org/pipermail/linux-mtd/2023-December/102423.html
Fixes: 3cc4718fa644 ("mtd: rawnand: brcmnand: exec_op implementation")
Signed-off-by: David Regan <[email protected]>
Reviewed-by: William Zhang <[email protected]>
---
Changes in v3: None
---
Changes in v2:
- Added to patch series
---
drivers/mtd/nand/raw/brcmnand/brcmnand.c | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/drivers/mtd/nand/raw/brcmnand/brcmnand.c b/drivers/mtd/nand/raw/brcmnand/brcmnand.c
index 9a904c7c6dad..6b5d76eff0ec 100644
--- a/drivers/mtd/nand/raw/brcmnand/brcmnand.c
+++ b/drivers/mtd/nand/raw/brcmnand/brcmnand.c
@@ -625,7 +625,7 @@ enum {
/* Only for v7.2 */
#define ACC_CONTROL_ECC_EXT_SHIFT 13

-static u8 brcmnand_status(struct brcmnand_host *host);
+static int brcmnand_status(struct brcmnand_host *host);

static inline bool brcmnand_non_mmio_ops(struct brcmnand_controller *ctrl)
{
@@ -1749,7 +1749,7 @@ static int brcmnand_waitfunc(struct nand_chip *chip)
INTFC_FLASH_STATUS;
}

-static u8 brcmnand_status(struct brcmnand_host *host)
+static int brcmnand_status(struct brcmnand_host *host)
{
struct nand_chip *chip = &host->chip;
struct mtd_info *mtd = nand_to_mtd(chip);
@@ -1760,7 +1760,7 @@ static u8 brcmnand_status(struct brcmnand_host *host)
return brcmnand_waitfunc(chip);
}

-static u8 brcmnand_reset(struct brcmnand_host *host)
+static int brcmnand_reset(struct brcmnand_host *host)
{
struct nand_chip *chip = &host->chip;

@@ -2492,11 +2492,14 @@ static int brcmnand_exec_op(struct nand_chip *chip,

if (brcmnand_op_is_status(op)) {
status = op->instrs[1].ctx.data.buf.in;
- *status = brcmnand_status(host);
+ ret = brcmnand_status(host);
+ if (ret < 0)
+ return ret;
+
+ *status = ret & 0xFF;

return 0;
- }
- else if (brcmnand_op_is_reset(op)) {
+ } else if (brcmnand_op_is_reset(op)) {
ret = brcmnand_reset(host);
if (ret < 0)
return ret;
--
2.37.3

2024-01-24 17:38:29

by Miquel Raynal

Subject: Re: [PATCH v3 08/10] mtd: rawnand: brcmnand: exec_op helper functions return type fixes

Hi David,

[email protected] wrote on Tue, 23 Jan 2024 19:04:56 -0800:

> fix return type for exec_op reset and status detect helper functions

Style, please.

Fix --> .

>
> Reported-by: Dan Carpenter <[email protected]>
> Closes: http://lists.infradead.org/pipermail/linux-mtd/2023-December/102423.html
> Fixes: 3cc4718fa644 ("mtd: rawnand: brcmnand: exec_op implementation")
> Signed-off-by: David Regan <[email protected]>
> Reviewed-by: William Zhang <[email protected]>
> ---
> Changes in v3: None
> ---
> Changes in v2:
> - Added to patch series
> ---
> drivers/mtd/nand/raw/brcmnand/brcmnand.c | 15 +++++++++------
> 1 file changed, 9 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/mtd/nand/raw/brcmnand/brcmnand.c b/drivers/mtd/nand/raw/brcmnand/brcmnand.c
> index 9a904c7c6dad..6b5d76eff0ec 100644
> --- a/drivers/mtd/nand/raw/brcmnand/brcmnand.c
> +++ b/drivers/mtd/nand/raw/brcmnand/brcmnand.c
> @@ -625,7 +625,7 @@ enum {
> /* Only for v7.2 */
> #define ACC_CONTROL_ECC_EXT_SHIFT 13
>
> -static u8 brcmnand_status(struct brcmnand_host *host);
> +static int brcmnand_status(struct brcmnand_host *host);
>
> static inline bool brcmnand_non_mmio_ops(struct brcmnand_controller *ctrl)
> {
> @@ -1749,7 +1749,7 @@ static int brcmnand_waitfunc(struct nand_chip *chip)
> INTFC_FLASH_STATUS;
> }
>
> -static u8 brcmnand_status(struct brcmnand_host *host)
> +static int brcmnand_status(struct brcmnand_host *host)
> {
> struct nand_chip *chip = &host->chip;
> struct mtd_info *mtd = nand_to_mtd(chip);
> @@ -1760,7 +1760,7 @@ static u8 brcmnand_status(struct brcmnand_host *host)
> return brcmnand_waitfunc(chip);
> }
>
> -static u8 brcmnand_reset(struct brcmnand_host *host)
> +static int brcmnand_reset(struct brcmnand_host *host)
> {
> struct nand_chip *chip = &host->chip;
>
> @@ -2492,11 +2492,14 @@ static int brcmnand_exec_op(struct nand_chip *chip,
>
> if (brcmnand_op_is_status(op)) {
> status = op->instrs[1].ctx.data.buf.in;
> - *status = brcmnand_status(host);
> + ret = brcmnand_status(host);
> + if (ret < 0)
> + return ret;
> +
> + *status = ret & 0xFF;
>
> return 0;
> - }
> - else if (brcmnand_op_is_reset(op)) {
> + } else if (brcmnand_op_is_reset(op)) {
> ret = brcmnand_reset(host);
> if (ret < 0)
> return ret;


Thanks,
Miquèl