diff mbox series

mtd: spi-nor: fix minmax.cocci warnings

Message ID alpine.DEB.2.22.394.2203260929310.3141@hadrien (mailing list archive)
State New, archived
Headers show
Series mtd: spi-nor: fix minmax.cocci warnings | expand

Commit Message

Julia Lawall March 26, 2022, 8:30 a.m. UTC
From: kernel test robot <lkp@intel.com>

Use min to simplify the code.

Generated by: scripts/coccinelle/misc/minmax.cocci

Fixes: 2747bc2106aa ("mtd: spi-nor: Add dual parallel and stacked mode support")
CC: Amit Kumar Mahapatra <amit.kumar-mahapatra@xilinx.com>
Reported-by: kernel test robot <lkp@intel.com>
Signed-off-by: kernel test robot <lkp@intel.com>
Signed-off-by: Julia Lawall <julia.lawall@inria.fr>
---

tree:   https://github.com/Xilinx/linux-xlnx xlnx_rebase_v5.15_LTS
head:   1870e0fa79a9d58c6748c34550f3ccea0b515933
commit: 2747bc2106aa429773d9a932c799aa6229595148 [840/1029] mtd: spi-nor: Add dual parallel and stacked mode support
:::::: branch date: 34 hours ago
:::::: commit date: 8 weeks ago

 drivers/mtd/spi-nor/core.c |    5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

Comments

Vignesh Raghavendra March 28, 2022, 5:58 a.m. UTC | #1
Hi.

On 26/03/22 2:00 pm, Julia Lawall wrote:
> From: kernel test robot <lkp@intel.com>
> 
> Use min to simplify the code.
> 
> Generated by: scripts/coccinelle/misc/minmax.cocci
> 
> Fixes: 2747bc2106aa ("mtd: spi-nor: Add dual parallel and stacked mode support")
> CC: Amit Kumar Mahapatra <amit.kumar-mahapatra@xilinx.com>
> Reported-by: kernel test robot <lkp@intel.com>
> Signed-off-by: kernel test robot <lkp@intel.com>
> Signed-off-by: Julia Lawall <julia.lawall@inria.fr>
> ---
> 
> tree:   https://github.com/Xilinx/linux-xlnx xlnx_rebase_v5.15_LTS
> head:   1870e0fa79a9d58c6748c34550f3ccea0b515933
> commit: 2747bc2106aa429773d9a932c799aa6229595148 [840/1029] mtd: spi-nor: Add dual parallel and stacked mode support
> :::::: branch date: 34 hours ago
> :::::: commit date: 8 weeks ago
> 
>  drivers/mtd/spi-nor/core.c |    5 +----
>  1 file changed, 1 insertion(+), 4 deletions(-)
> 
> --- a/drivers/mtd/spi-nor/core.c
> +++ b/drivers/mtd/spi-nor/core.c
> @@ -2034,10 +2034,7 @@ static int spi_nor_read(struct mtd_info
>  						(offset << nor->shift);
>  			}
>  		}
> -		if (len < rem_bank_len)
> -			read_len = len;
> -		else
> -			read_len = rem_bank_len;
> +		read_len = min(len, rem_bank_len);

This chunk does not exist in mainline. Seems like xlnx local changes.

Regards
Vignesh
Pratyush Yadav March 29, 2022, 11:38 a.m. UTC | #2
On 28/03/22 11:28AM, Vignesh Raghavendra wrote:
> Hi.
> 
> On 26/03/22 2:00 pm, Julia Lawall wrote:
> > From: kernel test robot <lkp@intel.com>
> > 
> > Use min to simplify the code.
> > 
> > Generated by: scripts/coccinelle/misc/minmax.cocci
> > 
> > Fixes: 2747bc2106aa ("mtd: spi-nor: Add dual parallel and stacked mode support")
> > CC: Amit Kumar Mahapatra <amit.kumar-mahapatra@xilinx.com>
> > Reported-by: kernel test robot <lkp@intel.com>
> > Signed-off-by: kernel test robot <lkp@intel.com>
> > Signed-off-by: Julia Lawall <julia.lawall@inria.fr>
> > ---
> > 
> > tree:   https://github.com/Xilinx/linux-xlnx xlnx_rebase_v5.15_LTS
> > head:   1870e0fa79a9d58c6748c34550f3ccea0b515933
> > commit: 2747bc2106aa429773d9a932c799aa6229595148 [840/1029] mtd: spi-nor: Add dual parallel and stacked mode support
> > :::::: branch date: 34 hours ago
> > :::::: commit date: 8 weeks ago
> > 
> >  drivers/mtd/spi-nor/core.c |    5 +----
> >  1 file changed, 1 insertion(+), 4 deletions(-)
> > 
> > --- a/drivers/mtd/spi-nor/core.c
> > +++ b/drivers/mtd/spi-nor/core.c
> > @@ -2034,10 +2034,7 @@ static int spi_nor_read(struct mtd_info
> >  						(offset << nor->shift);
> >  			}
> >  		}
> > -		if (len < rem_bank_len)
> > -			read_len = len;
> > -		else
> > -			read_len = rem_bank_len;
> > +		read_len = min(len, rem_bank_len);
> 
> This chunk does not exist in mainline. Seems like xlnx local changes.

Yes. I was very confused for a bit until I realized. It would be nice if 
upstream maintainers and mailing lists were not Cced if the patch does 
not target the mainline branch.
diff mbox series

Patch

--- a/drivers/mtd/spi-nor/core.c
+++ b/drivers/mtd/spi-nor/core.c
@@ -2034,10 +2034,7 @@  static int spi_nor_read(struct mtd_info
 						(offset << nor->shift);
 			}
 		}
-		if (len < rem_bank_len)
-			read_len = len;
-		else
-			read_len = rem_bank_len;
+		read_len = min(len, rem_bank_len);

 		/* Wait till previous write/erase is done. */
 		ret = spi_nor_wait_till_ready(nor);