Skip to contentSkip to conversation

mtd: rawnand: meson: remove unnecessary condition in meson_nfc_select_chip()

PATCH In review Dan Carpenter 2 participants 2 messages Feb 1, 2019 – Feb 2, 2019

Subsystems (5)
Kernel janitors Memory technology devices (MTD) Arm/Amlogic Meson SoC support NAND flash +1 more subsystems
lore
Share & tools
lore

Dan Carpenter

author
#0 lore raw

PATCH 3/3 mtd: rawnand: meson: remove unnecessary condition in meson_nfc_select_chip()

If chip is negative then we return at the very start of the function. Removing the check lets us pull everything in one indent level.

Signed-off-by Dan Carpenter <[email protected]>
---
 drivers/mtd/nand/raw/meson_nand.c | 28 ++++++++++++----------------
 1 file changed, 12 insertions(+), 16 deletions(-)
drivers/mtd/nand/raw/meson_nand.c +12 -16
index 0d93d0b9c1af..105d12103ca6 100644
@@ -234,23 +234,19 @@ static void meson_nfc_select_chip(struct nand_chip *nand, int chip)
 	nfc->timing.tadl = meson_chip->tadl;
 	nfc->timing.tbers_max = meson_chip->tbers_max;
 
-	if (chip >= 0) {
-		if (nfc->clk_rate != meson_chip->clk_rate) {
-			ret = clk_set_rate(nfc->device_clk,
-					   meson_chip->clk_rate);
-			if (ret) {
-				dev_err(nfc->dev, "failed to set clock rate\n");
-				return;
-			}
-			nfc->clk_rate = meson_chip->clk_rate;
-		}
-		if (nfc->bus_timing != meson_chip->bus_timing) {
-			value = (NFC_CLK_CYCLE - 1)
-				| (meson_chip->bus_timing << 5);
-			writel(value, nfc->reg_base + NFC_REG_CFG);
-			writel((1 << 31), nfc->reg_base + NFC_REG_CMD);
-			nfc->bus_timing =  meson_chip->bus_timing;
+	if (nfc->clk_rate != meson_chip->clk_rate) {
+		ret = clk_set_rate(nfc->device_clk, meson_chip->clk_rate);
+		if (ret) {
+			dev_err(nfc->dev, "failed to set clock rate\n");
+			return;
 		}
+		nfc->clk_rate = meson_chip->clk_rate;
+	}
+	if (nfc->bus_timing != meson_chip->bus_timing) {
+		value = (NFC_CLK_CYCLE - 1) | (meson_chip->bus_timing << 5);
+		writel(value, nfc->reg_base + NFC_REG_CFG);
+		writel((1 << 31), nfc->reg_base + NFC_REG_CMD);
+		nfc->bus_timing =  meson_chip->bus_timing;
 	}
 }
Signature · 1 line
2.17.1
maintainer Acked-by on v1 3/3
#1 lore raw
Quoted 36 lines · Dan Carpenter

If chip is negative then we return at the very start of the function. Removing the check lets us pull everything in one indent level.

Signed-off-by Dan Carpenter <[email protected]>
---
  drivers/mtd/nand/raw/meson_nand.c | 28 ++++++++++++----------------
  1 file changed, 12 insertions(+), 16 deletions(-)
drivers/mtd/nand/raw/meson_nand.c +4 -16
index 0d93d0b9c1af..105d12103ca6 100644
@@ -234,23 +234,19 @@ static void meson_nfc_select_chip(struct nand_chip *nand, int chip)
  	nfc->timing.tadl = meson_chip->tadl;
  	nfc->timing.tbers_max = meson_chip->tbers_max;
 
-	if (chip >= 0) {
-		if (nfc->clk_rate != meson_chip->clk_rate) {
-			ret = clk_set_rate(nfc->device_clk,
-					   meson_chip->clk_rate);
-			if (ret) {
-				dev_err(nfc->dev, "failed to set clock rate\n");
-				return;
-			}
-			nfc->clk_rate = meson_chip->clk_rate;
-		}
-		if (nfc->bus_timing != meson_chip->bus_timing) {
-			value = (NFC_CLK_CYCLE - 1)
-				| (meson_chip->bus_timing << 5);
-			writel(value, nfc->reg_base + NFC_REG_CFG);
-			writel((1 << 31), nfc->reg_base + NFC_REG_CMD);
-			nfc->bus_timing =  meson_chip->bus_timing;
+	if (nfc->clk_rate != meson_chip->clk_rate) {
+		ret = clk_set_rate(nfc->device_clk, meson_chip->clk_rate);
+		if (ret) {
+			dev_err(nfc->dev, "failed to set clock rate\n");

drivers/mtd/nand/raw/meson_nand.c static void meson_nfc_select_chip(struct nand_chip *nand, int chip) · line 250

Quoted 10 lines
drivers/mtd/nand/raw/meson_nand.c +8 -0
+			return;
  		}
+		nfc->clk_rate = meson_chip->clk_rate;
+	}
+	if (nfc->bus_timing != meson_chip->bus_timing) {
+		value = (NFC_CLK_CYCLE - 1) | (meson_chip->bus_timing << 5);
+		writel(value, nfc->reg_base + NFC_REG_CFG);
+		writel((1 << 31), nfc->reg_base + NFC_REG_CMD);
+		nfc->bus_timing =  meson_chip->bus_timing;
  	}

Indeed, we need not check chip >= 0 again. Thank you.

Acked-by Liang Yang <[email protected]>

drivers/mtd/nand/raw/meson_nand.c static void meson_nfc_select_chip(struct nand_chip *nand, int chip) · line 252

Quoted 3 lines
drivers/mtd/nand/raw/meson_nand.c +0 -0
  }

_______________________________________________
linux-amlogic mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-amlogic