]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
mtd: spi-nor: Remove recently added write_disable() call
authorMarek Vasut <marek.vasut+renesas@mailbox.org>
Sat, 26 Oct 2024 20:16:21 +0000 (22:16 +0200)
committerTom Rini <trini@konsulko.com>
Thu, 31 Oct 2024 16:49:47 +0000 (10:49 -0600)
Remove undocumented write_disable() call. This was added in commit
5d40b3d384dc ("mtd: spi-nor: Add parallel and stacked memories support")
without any explanation in the commit message. Remove it.

Fixes: 5d40b3d384dc ("mtd: spi-nor: Add parallel and stacked memories support")
Signed-off-by: Marek Vasut <marek.vasut+renesas@mailbox.org>
drivers/mtd/spi/spi-nor-core.c

index 3114281832bb269f9b37ceae14afc46d1a66dd46..d22363e8267b3d1b6e56edaed09170128bf18074 100644 (file)
@@ -2073,10 +2073,6 @@ static int spi_nor_write(struct mtd_info *mtd, loff_t to, size_t len,
                if (ret)
                        goto write_err;
 
-               ret = write_disable(nor);
-               if (ret)
-                       goto write_err;
-
                *retlen += written;
                i += written;
        }
@@ -2117,10 +2113,6 @@ static int macronix_quad_enable(struct spi_nor *nor)
        if (ret)
                return ret;
 
-       ret = write_disable(nor);
-       if (ret)
-               return ret;
-
        ret = read_sr(nor);
        if (!(ret > 0 && (ret & SR_QUAD_EN_MX))) {
                dev_err(nor->dev, "Macronix Quad bit not set\n");
@@ -2182,7 +2174,7 @@ static int spansion_quad_enable_volatile(struct spi_nor *nor, u32 addr_base,
                return -EINVAL;
        }
 
-       return write_disable(nor);
+       return 0;
 }
 #endif