mtd: rawnand: meson: refactor use of 'meson_nfc_cmd_access()'

Move call 'meson_nfc_cmd_seed()' and check for 'NAND_NEED_SCRAMBLING'
to 'meson_nfc_cmd_access()', thus removing code duplication.

Signed-off-by: Arseniy Krasnov <avkrasnov@salutedevices.com>
Reviewed-by: Michael Trimarchi <michael@amarulasolutions.com>
Link: https://lore.kernel.org/r/20240826131710.29746-3-avkrasnov@salutedevices.com
Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>

diff --git a/drivers/mtd/nand/raw/meson_nand.c b/drivers/mtd/nand/raw/meson_nand.c
index 12499a79478318dda4db74251042ffe6af85f69d..2d77ee51ce5b0e9fa85beed92cd48b0f0800af33 100644 (file)
--- a/drivers/mtd/nand/raw/meson_nand.c
+++ b/drivers/mtd/nand/raw/meson_nand.c
@@ -228,14 +228,19 @@ static void meson_nfc_cmd_seed(const struct meson_nfc *nfc, u32 seed)
               nfc->reg_base + NFC_REG_CMD);
 }
 
-static void meson_nfc_cmd_access(struct nand_chip *nand, bool raw, bool dir,
-                                int scrambler)
+static void meson_nfc_cmd_access(struct nand_chip *nand, bool raw, bool dir, int page)
 {
        struct mtd_info *mtd = nand_to_mtd(nand);
        const struct meson_nfc *nfc = nand_get_controller_data(mtd_to_nand(mtd));
        const struct meson_nfc_nand_chip *meson_chip = to_meson_nand(nand);
        u32 bch = meson_chip->bch_mode, cmd;
        int len = mtd->writesize, pagesize, pages;
+       unsigned int scrambler;
+
+       if (nand->options & NAND_NEED_SCRAMBLING)
+               scrambler = NFC_CMD_SCRAMBLER_ENABLE;
+       else
+               scrambler = NFC_CMD_SCRAMBLER_DISABLE;
 
        pagesize = nand->ecc.size;
 
@@ -251,6 +256,9 @@ static void meson_nfc_cmd_access(struct nand_chip *nand, bool raw, bool dir,
        cmd = CMDRWGEN(DMA_DIR(dir), scrambler, bch,
                       NFC_CMD_SHORTMODE_DISABLE, pagesize, pages);
 
+       if (scrambler == NFC_CMD_SCRAMBLER_ENABLE)
+               meson_nfc_cmd_seed(nfc, page);
+
        writel(cmd, nfc->reg_base + NFC_REG_CMD);
 }
 
@@ -565,14 +573,7 @@ static int meson_nfc_write_page_sub(struct nand_chip *nand,
                return ret;
        }
 
-       if (nand->options & NAND_NEED_SCRAMBLING) {
-               meson_nfc_cmd_seed(nfc, page);
-               meson_nfc_cmd_access(nand, raw, DIRWRITE,
-                                    NFC_CMD_SCRAMBLER_ENABLE);
-       } else {
-               meson_nfc_cmd_access(nand, raw, DIRWRITE,
-                                    NFC_CMD_SCRAMBLER_DISABLE);
-       }
+       meson_nfc_cmd_access(nand, raw, DIRWRITE, page);
 
        cmd = nfc->param.chip_select | NFC_CMD_CLE | NAND_CMD_PAGEPROG;
        writel(cmd, nfc->reg_base + NFC_REG_CMD);
@@ -643,14 +644,7 @@ static int meson_nfc_read_page_sub(struct nand_chip *nand,
        if (ret)
                return ret;
 
-       if (nand->options & NAND_NEED_SCRAMBLING) {
-               meson_nfc_cmd_seed(nfc, page);
-               meson_nfc_cmd_access(nand, raw, DIRREAD,
-                                    NFC_CMD_SCRAMBLER_ENABLE);
-       } else {
-               meson_nfc_cmd_access(nand, raw, DIRREAD,
-                                    NFC_CMD_SCRAMBLER_DISABLE);
-       }
+       meson_nfc_cmd_access(nand, raw, DIRREAD, page);
 
        meson_nfc_wait_dma_finish(nfc);
        meson_nfc_check_ecc_pages_valid(nfc, nand, raw);