target/linux/lantiq/patches-5.15/0302-mtd-cfi_cmdset_0001-Disable-write-buffer-functions-i.patch

   1 From 118fe2c88b35482711adeee0d8758bddfe958701 Mon Sep 17 00:00:00 2001
   2 From: Aleksander Jan Bajkowski <olek2@wp.pl>
   3 Date: Sat, 6 May 2023 14:32:00 +0200
   4 Subject: [PATCH] mtd: cfi_cmdset_0001: Disable write buffer functions if
   5  FORCE_WORD_WRITE is 1
   6
   7 Some write buffer functions are not used when FORCE_WORD_WRITE is set to 1.
   8 So the compile warning messages are output if FORCE_WORD_WRITE is 1. To
   9 resolve this disable the write buffer functions if FORCE_WORD_WRITE is 1.
  10
  11 This is similar fix to: 557c759036fc3976a5358cef23e65a263853b93f.
  12
  13 Signed-off-by: Aleksander Jan Bajkowski <olek2@wp.pl>
  14 ---
  15  drivers/mtd/chips/cfi_cmdset_0001.c | 6 ++++++
  16  1 file changed, 6 insertions(+)
  17
  18 --- a/drivers/mtd/chips/cfi_cmdset_0001.c
  19 +++ b/drivers/mtd/chips/cfi_cmdset_0001.c
  20 @@ -61,8 +61,10 @@
  21
  22  static int cfi_intelext_read (struct mtd_info *, loff_t, size_t, size_t *, u_char *);
  23  static int cfi_intelext_write_words(struct mtd_info *, loff_t, size_t, size_t *, const u_char *);
  24 +#if !FORCE_WORD_WRITE
  25  static int cfi_intelext_write_buffers(struct mtd_info *, loff_t, size_t, size_t *, const u_char *);
  26  static int cfi_intelext_writev(struct mtd_info *, const struct kvec *, unsigned long, loff_t, size_t *);
  27 +#endif
  28  static int cfi_intelext_erase_varsize(struct mtd_info *, struct erase_info *);
  29  static void cfi_intelext_sync (struct mtd_info *);
  30  static int cfi_intelext_lock(struct mtd_info *mtd, loff_t ofs, uint64_t len);
  31 @@ -304,6 +306,7 @@ static void fixup_use_point(struct mtd_i
  32         }
  33  }
  34
  35 +#if !FORCE_WORD_WRITE
  36  static void fixup_use_write_buffers(struct mtd_info *mtd)
  37  {
  38         struct map_info *map = mtd->priv;
  39 @@ -314,6 +317,7 @@ static void fixup_use_write_buffers(stru
  40                 mtd->_writev = cfi_intelext_writev;
  41         }
  42  }
  43 +#endif /* !FORCE_WORD_WRITE */
  44
  45  /*
  46   * Some chips power-up with all sectors locked by default.
  47 @@ -1703,6 +1707,7 @@ static int cfi_intelext_write_words (str
  48  }
  49
  50
  51 +#if !FORCE_WORD_WRITE
  52  static int __xipram do_write_buffer(struct map_info *map, struct flchip *chip,
  53                                     unsigned long adr, const struct kvec **pvec,
  54                                     unsigned long *pvec_seek, int len)
  55 @@ -1931,6 +1936,7 @@ static int cfi_intelext_write_buffers (s
  56
  57         return cfi_intelext_writev(mtd, &vec, 1, to, retlen);
  58  }
  59 +#endif /* !FORCE_WORD_WRITE */
  60
  61  static int __xipram do_erase_oneblock(struct map_info *map, struct flchip *chip,
  62                                       unsigned long adr, int len, void *thunk)