The offset variable is set, but never used afterward.
Fix indent. Fix predecrement without justification.
Remove use of parenthesis where unnecessary.

Fixes: 5d40b3d384dc ("mtd: spi-nor: Add parallel and stacked memories support")
Signed-off-by: Marek Vasut <marek.vasut+rene...@mailbox.org>
---
Cc: Andre Przywara <andre.przyw...@arm.com>
Cc: Ashok Reddy Soma <ashok.reddy.s...@amd.com>
Cc: Jagan Teki <ja...@amarulasolutions.com>
Cc: Michael Walle <mwa...@kernel.org>
Cc: Michal Simek <michal.si...@amd.com>
Cc: Patrice Chotard <patrice.chot...@foss.st.com>
Cc: Patrick Delaunay <patrick.delau...@foss.st.com>
Cc: Pratyush Yadav <p.ya...@ti.com>
Cc: Quentin Schulz <quentin.sch...@cherry.de>
Cc: Sean Anderson <sean...@gmail.com>
Cc: Simon Glass <s...@chromium.org>
Cc: Takahiro Kuwano <takahiro.kuw...@infineon.com>
Cc: Tom Rini <tr...@konsulko.com>
Cc: Tudor Ambarus <tudor.amba...@linaro.org>
Cc: Venkatesh Yadav Abbarapu <venkatesh.abbar...@amd.com>
Cc: u-boot@lists.denx.de
Cc: uboot-st...@st-md-mailman.stormreply.com
---
 drivers/mtd/spi/spi-nor-core.c | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/drivers/mtd/spi/spi-nor-core.c b/drivers/mtd/spi/spi-nor-core.c
index 3c47751348e..e49b7cad023 100644
--- a/drivers/mtd/spi/spi-nor-core.c
+++ b/drivers/mtd/spi/spi-nor-core.c
@@ -1134,12 +1134,10 @@ static int spi_nor_erase(struct mtd_info *mtd, struct 
erase_info *instr)
                        offset /= 2;
 
                if (nor->flags & SNOR_F_HAS_STACKED) {
-                       if (offset >= (mtd->size / 2)) {
-                               offset = offset - (mtd->size / 2);
+                       if (offset >= (mtd->size / 2))
                                nor->spi->flags |= SPI_XFER_U_PAGE;
-                       } else {
+                       else
                                nor->spi->flags &= ~SPI_XFER_U_PAGE;
-                       }
                }
 #ifdef CONFIG_SPI_FLASH_BAR
                ret = write_bar(nor, addr);
@@ -1588,7 +1586,7 @@ static int spi_nor_read(struct mtd_info *mtd, loff_t 
from, size_t len,
        dev_dbg(nor->dev, "from 0x%08x, len %zd\n", (u32)from, len);
 
        if ((nor->flags & SNOR_F_HAS_PARALLEL) && (offset & 1)) {
-           /* We can hit this case when we use file system like ubifs */
+               /* We can hit this case when we use file system like ubifs */
                from--;
                len++;
                is_ofst_odd = true;
@@ -1969,9 +1967,9 @@ static int spi_nor_write(struct mtd_info *mtd, loff_t to, 
size_t len,
                        return ret;
 
                *retlen += 1; /* We've written only one actual byte */
-               ++buf;
-               --len;
-               ++to;
+               buf++;
+               len--;
+               to++;
        }
 
        for (i = 0; i < len; ) {
@@ -1991,7 +1989,7 @@ static int spi_nor_write(struct mtd_info *mtd, loff_t to, 
size_t len,
 
                        page_offset = do_div(aux, nor->page_size);
                }
-               offset = (to + i);
+               offset = to + i;
                if (nor->flags & SNOR_F_HAS_PARALLEL)
                        offset /= 2;
 
-- 
2.45.2

Reply via email to