| Message ID | 20221229181526.53766-3-samuel@sholland.org |
|---|---|
| State | Accepted |
| Headers | show |
| Series | mtd: rawnand: sunxi: Bug fixes and cleanup | expand |
Hi Samuel, samuel@sholland.org wrote on Thu, 29 Dec 2022 12:15:21 -0600: > sunxi_nand->nsels cannot be zero, so the second check implies the first. Actually this check comes from a time where we did check against -1 :) But, yeah, now it's a duplicate. > Signed-off-by: Samuel Holland <samuel@sholland.org> > --- > > drivers/mtd/nand/raw/sunxi_nand.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/mtd/nand/raw/sunxi_nand.c b/drivers/mtd/nand/raw/sunxi_nand.c > index 2ee86f7b0905..8b221f9f10a7 100644 > --- a/drivers/mtd/nand/raw/sunxi_nand.c > +++ b/drivers/mtd/nand/raw/sunxi_nand.c > @@ -421,7 +421,7 @@ static void sunxi_nfc_select_chip(struct nand_chip *nand, unsigned int cs) > struct sunxi_nand_chip_sel *sel; > u32 ctl; > > - if (cs > 0 && cs >= sunxi_nand->nsels) > + if (cs >= sunxi_nand->nsels) > return; > > ctl = readl(nfc->regs + NFC_REG_CTL) & Thanks, Miquèl
On Thu, 2022-12-29 at 18:15:21 UTC, Samuel Holland wrote: > sunxi_nand->nsels cannot be zero, so the second check implies the first. > > Signed-off-by: Samuel Holland <samuel@sholland.org> Applied to https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git nand/next, thanks. Miquel
diff --git a/drivers/mtd/nand/raw/sunxi_nand.c b/drivers/mtd/nand/raw/sunxi_nand.c index 2ee86f7b0905..8b221f9f10a7 100644 --- a/drivers/mtd/nand/raw/sunxi_nand.c +++ b/drivers/mtd/nand/raw/sunxi_nand.c @@ -421,7 +421,7 @@ static void sunxi_nfc_select_chip(struct nand_chip *nand, unsigned int cs) struct sunxi_nand_chip_sel *sel; u32 ctl; - if (cs > 0 && cs >= sunxi_nand->nsels) + if (cs >= sunxi_nand->nsels) return; ctl = readl(nfc->regs + NFC_REG_CTL) &
sunxi_nand->nsels cannot be zero, so the second check implies the first. Signed-off-by: Samuel Holland <samuel@sholland.org> --- drivers/mtd/nand/raw/sunxi_nand.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)