Commit 1df1fc8c authored by Tudor Ambarus's avatar Tudor Ambarus Committed by Miquel Raynal
Browse files

mtd: core: Constify buf in mtd_write_user_prot_reg() 



The write buffer comes from user and should be const.
Constify write buffer in mtd core and across all _write_user_prot_reg()
users. cfi_cmdset_{0001, 0002} and onenand_base will pay the cost of an
explicit cast to discard the const qualifier since the beginning, since
they are using an otp_op_t function prototype that is used for both reads
and writes. mtd_dataflash and SPI NOR will benefit of the const buffer
because they are using different paths for writes and reads.

Signed-off-by: default avatarTudor Ambarus <tudor.ambarus@microchip.com>
Signed-off-by: default avatarMiquel Raynal <miquel.raynal@bootlin.com>
Link: https://lore.kernel.org/linux-mtd/20210403060931.7119-1-tudor.ambarus@microchip.com
parent ef4ed780

drivers/mtd/chips/cfi_cmdset_0001.c

+4 −3
Original line number Diff line number Diff line
@@ -72,7 +72,8 @@ static int cfi_intelext_is_locked(struct mtd_info *mtd, loff_t ofs, 
#ifdef CONFIG_MTD_OTP

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

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

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

static int cfi_intelext_write_user_prot_reg(struct mtd_info *, loff_t, size_t,

					    size_t *, const u_char *);

static int cfi_intelext_lock_user_prot_reg (struct mtd_info *, loff_t, size_t);

static int cfi_intelext_get_fact_prot_info(struct mtd_info *, size_t,

					   size_t *, struct otp_info *);
@@ -2447,10 +2448,10 @@ static int cfi_intelext_read_user_prot_reg(struct mtd_info *mtd, loff_t from, 


static int cfi_intelext_write_user_prot_reg(struct mtd_info *mtd, loff_t from,

					    size_t len, size_t *retlen,

					     u_char *buf)

					    const u_char *buf)

{

	return cfi_intelext_otp_walk(mtd, from, len, retlen,

				     buf, do_otp_write, 1);

				     (u_char *)buf, do_otp_write, 1);

}



static int cfi_intelext_lock_user_prot_reg(struct mtd_info *mtd,

drivers/mtd/chips/cfi_cmdset_0002.c

+3 −3
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ static int cfi_amdstd_read_fact_prot_reg(struct mtd_info *, loff_t, size_t, 
static int cfi_amdstd_read_user_prot_reg(struct mtd_info *, loff_t, size_t,

					 size_t *, u_char *);

static int cfi_amdstd_write_user_prot_reg(struct mtd_info *, loff_t, size_t,

					  size_t *, u_char *);

					  size_t *, const u_char *);

static int cfi_amdstd_lock_user_prot_reg(struct mtd_info *, loff_t, size_t);



static int cfi_amdstd_panic_write(struct mtd_info *mtd, loff_t to, size_t len,
@@ -1635,9 +1635,9 @@ static int cfi_amdstd_read_user_prot_reg(struct mtd_info *mtd, loff_t from, 


static int cfi_amdstd_write_user_prot_reg(struct mtd_info *mtd, loff_t from,

					  size_t len, size_t *retlen,

					  u_char *buf)

					  const u_char *buf)

{

	return cfi_amdstd_otp_walk(mtd, from, len, retlen, buf,

	return cfi_amdstd_otp_walk(mtd, from, len, retlen, (u_char *)buf,

				   do_otp_write, 1);

}

drivers/mtd/devices/mtd_dataflash.c

+1 −1
Original line number Diff line number Diff line
@@ -527,7 +527,7 @@ static int dataflash_read_user_otp(struct mtd_info *mtd, 
}



static int dataflash_write_user_otp(struct mtd_info *mtd,

		loff_t from, size_t len, size_t *retlen, u_char *buf)

		loff_t from, size_t len, size_t *retlen, const u_char *buf)

{

	struct spi_message	m;

	const size_t		l = 4 + 64;

drivers/mtd/mtdcore.c

+1 −1
Original line number Diff line number Diff line
@@ -1889,7 +1889,7 @@ int mtd_read_user_prot_reg(struct mtd_info *mtd, loff_t from, size_t len, 
EXPORT_SYMBOL_GPL(mtd_read_user_prot_reg);



int mtd_write_user_prot_reg(struct mtd_info *mtd, loff_t to, size_t len,

			    size_t *retlen, u_char *buf)

			    size_t *retlen, const u_char *buf)

{

	struct mtd_info *master = mtd_get_master(mtd);

	int ret;

drivers/mtd/nand/onenand/onenand_base.c

+3 −2
Original line number Diff line number Diff line
@@ -3167,9 +3167,10 @@ static int onenand_read_user_prot_reg(struct mtd_info *mtd, loff_t from, 
 * Write user OTP area.

 */

static int onenand_write_user_prot_reg(struct mtd_info *mtd, loff_t from,

			size_t len, size_t *retlen, u_char *buf)

			size_t len, size_t *retlen, const u_char *buf)

{

	return onenand_otp_walk(mtd, from, len, retlen, buf, do_otp_write, MTD_OTP_USER);

	return onenand_otp_walk(mtd, from, len, retlen, (u_char *)buf,

				do_otp_write, MTD_OTP_USER);

}



/**