Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 557c7590 authored by Tokunori Ikegami's avatar Tokunori Ikegami Committed by Vignesh Raghavendra
Browse files

mtd: cfi_cmdset_0002: Disable write buffer functions if FORCE_WORD_WRITE is 1 



Some write buffer functions are not used when FORCE_WORD_WRITE is set to 1.
So the compile warning messages are output if FORCE_WORD_WRITE is 1. To
resolve this disable the write buffer functions if FORCE_WORD_WRITE is 1.

Cc: Fabio Bettoni <fbettoni@gmail.com>
Co: Hauke Mehrtens <hauke@hauke-m.de>
Cc: Chris Packham <chris.packham@alliedtelesis.co.nz>
Cc: Joakim Tjernlund <Joakim.Tjernlund@infinera.com>
Cc: linux-mtd@lists.infradead.org
Signed-off-by: default avatarTokunori Ikegami <ikegami.t@gmail.com>
Signed-off-by: default avatarVignesh Raghavendra <vigneshr@ti.com>
parent 0bcf880b

drivers/mtd/chips/cfi_cmdset_0002.c

+6 −0
Original line number Diff line number Diff line
@@ -61,7 +61,9 @@ 


static int cfi_amdstd_read (struct mtd_info *, loff_t, size_t, size_t *, u_char *);

static int cfi_amdstd_write_words(struct mtd_info *, loff_t, size_t, size_t *, const u_char *);

#if !FORCE_WORD_WRITE

static int cfi_amdstd_write_buffers(struct mtd_info *, loff_t, size_t, size_t *, const u_char *);

#endif

static int cfi_amdstd_erase_chip(struct mtd_info *, struct erase_info *);

static int cfi_amdstd_erase_varsize(struct mtd_info *, struct erase_info *);

static void cfi_amdstd_sync (struct mtd_info *);
@@ -256,6 +258,7 @@ static void fixup_amd_bootblock(struct mtd_info *mtd) 
}

#endif



#if !FORCE_WORD_WRITE

static void fixup_use_write_buffers(struct mtd_info *mtd)

{

	struct map_info *map = mtd->priv;
@@ -265,6 +268,7 @@ static void fixup_use_write_buffers(struct mtd_info *mtd) 
		mtd->_write = cfi_amdstd_write_buffers;

	}

}

#endif /* !FORCE_WORD_WRITE */



/* Atmel chips don't use the same PRI format as AMD chips */

static void fixup_convert_atmel_pri(struct mtd_info *mtd)
@@ -1929,6 +1933,7 @@ static int cfi_amdstd_write_words(struct mtd_info *mtd, loff_t to, size_t len, 
	return 0;

}



#if !FORCE_WORD_WRITE

static int __xipram do_write_buffer_wait(struct map_info *map,

					 struct flchip *chip, unsigned long adr,

					 map_word datum)
@@ -2158,6 +2163,7 @@ static int cfi_amdstd_write_buffers(struct mtd_info *mtd, loff_t to, size_t len, 


	return 0;

}

#endif /* !FORCE_WORD_WRITE */



/*

 * Wait for the flash chip to become ready to write data