git.openwrt.org Git - openwrt/staging/hauke.git/blob

   1 From 94ef3c35b935a63f6c156957c92f6cf33c9a8dae Mon Sep 17 00:00:00 2001
   2 From: Miquel Raynal <miquel.raynal@bootlin.com>
   3 Date: Thu, 27 Jan 2022 10:18:02 +0100
   4 Subject: [PATCH 08/15] mtd: spinand: Delay a little bit the dirmap creation
   5
   6 As we will soon tweak the dirmap creation to act a little bit
   7 differently depending on the picked ECC engine, we need to initialize
   8 dirmaps after ECC engines. This should not have any effect as dirmaps
   9 are not yet used at this point.
  10
  11 Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
  12 Reviewed-by: Boris Brezillon <boris.brezillon@collabora.com>
  13 Link: https://lore.kernel.org/linux-mtd/20220127091808.1043392-8-miquel.raynal@bootlin.com
  14 (cherry picked from commit dc4c2cbf0be2d4a8e2a65013ea2815bb2c8ba949)
  15 ---
  16  drivers/mtd/nand/spi/core.c | 16 ++++++++--------
  17  1 file changed, 8 insertions(+), 8 deletions(-)
  18
  19 --- a/drivers/mtd/nand/spi/core.c
  20 +++ b/drivers/mtd/nand/spi/core.c
  21 @@ -1221,14 +1221,6 @@ static int spinand_init(struct spinand_d
  22         if (ret)
  23                 goto err_free_bufs;
  24
  25 -       ret = spinand_create_dirmaps(spinand);
  26 -       if (ret) {
  27 -               dev_err(dev,
  28 -                       "Failed to create direct mappings for read/write operations (err = %d)\n",
  29 -                       ret);
  30 -               goto err_manuf_cleanup;
  31 -       }
  32 -
  33         ret = nanddev_init(nand, &spinand_ops, THIS_MODULE);
  34         if (ret)
  35                 goto err_manuf_cleanup;
  36 @@ -1263,6 +1255,14 @@ static int spinand_init(struct spinand_d
  37         mtd->ecc_strength = nanddev_get_ecc_conf(nand)->strength;
  38         mtd->ecc_step_size = nanddev_get_ecc_conf(nand)->step_size;
  39
  40 +       ret = spinand_create_dirmaps(spinand);
  41 +       if (ret) {
  42 +               dev_err(dev,
  43 +                       "Failed to create direct mappings for read/write operations (err = %d)\n",
  44 +                       ret);
  45 +               goto err_cleanup_ecc_engine;
  46 +       }
  47 +
  48         return 0;
  49
  50  err_cleanup_ecc_engine: