From nobody Sat Jul 25 15:52:31 2026 Received: from luna.linkmauve.fr (82-65-109-163.subs.proxad.net [82.65.109.163]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8F3DF424D79; Thu, 16 Jul 2026 14:24:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=82.65.109.163 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784211873; cv=none; b=jHZDctFFtKgSk5ruOERUOXHR3/Lo5LmQQcVhPLNUS3+Nhv8oPd8O009fQXDdM7n6oDx6l/KcOtUJBnZboA/bMEYURkc2WI3JMQvEU7ncf0dP3n5jj0BP+3iKO7TQspBtxO6x3INm+kCw2oUuurBJuomuMLvYJDqdbdBmONZQS0I= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784211873; c=relaxed/simple; bh=szY2TyJZt6l+QUzP9gUhW6p6HLZN6wQDe8/5rxc/2Gc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=RMe7q0a0WOaOTm1nOxYGLSjk02nM+zvPPDe+LuaCKqszWpcHAMlnid3Pze3th/qqstN4PSbg4aE0kuxTLrSbKvIfPZlVjjoU5QkMdqt9w2PVlk2w4EAizc0FAzE+zQV9Eb/mrNTQsmOlLqZxgf6Y53E1xmIJPCUtqpK8Zp/Kgic= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=linkmauve.fr; spf=pass smtp.mailfrom=linkmauve.fr; arc=none smtp.client-ip=82.65.109.163 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=linkmauve.fr Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linkmauve.fr Received: by luna.linkmauve.fr (Postfix, from userid 1000) id 5C42CF40D32; Thu, 16 Jul 2026 16:24:25 +0200 (CEST) From: Link Mauve To: Srinivas Kandagatla Cc: Link Mauve , Andy Shevchenko , Neil Armstrong , Kevin Hilman , Jerome Brunet , Martin Blumenstingl , Sven Peter , Janne Grunau , Neal Gompa , Frank Li , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , Vladimir Zapolskiy , =?UTF-8?q?Andr=C3=A9=20Draszik?= , Orson Zhai , Baolin Wang , Chunyan Zhang , Maxime Coquelin , Alexandre Torgue , Kalyani Akula , Michal Simek , Miguel Ojeda , Boqun Feng , Gary Guo , =?UTF-8?q?Bj=C3=B6rn=20Roy=20Baron?= , Benno Lossin , Andreas Hindborg , Alice Ryhl , Trevor Gross , Danilo Krummrich , Daniel Almeida , Tamir Duberstein , Alexandre Courbot , =?UTF-8?q?Onur=20=C3=96zkan?= , Johan Hovold , Ronald Claveau , Daniel Lezcano , linux-arm-kernel@lists.infradead.org, linux-amlogic@lists.infradead.org, linux-kernel@vger.kernel.org, asahi@lists.linux.dev, imx@lists.linux.dev, linux-arm-msm@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, rust-for-linux@vger.kernel.org Subject: [PATCH v3 1/4] nvmem: core: deprecate reg_write callback and add reg_write_const Date: Thu, 16 Jul 2026 16:24:08 +0200 Message-ID: <20260716142415.28718-2-linkmauve@linkmauve.fr> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260716142415.28718-1-linkmauve@linkmauve.fr> References: <20260716142415.28718-1-linkmauve@linkmauve.fr> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" This callback used to take a mutable void * for no reason, which causes the compiler to be unaware that the val buffer should never be modified by the callback. This was found while drafting the nvmem-provider Rust abstraction. Signed-off-by: Link Mauve --- drivers/nvmem/core.c | 28 ++++++++++++++++------------ drivers/nvmem/internals.h | 1 + include/linux/nvmem-provider.h | 6 +++++- 3 files changed, 22 insertions(+), 13 deletions(-) diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c index 73be55cfa203..9dafe63e4ef9 100644 --- a/drivers/nvmem/core.c +++ b/drivers/nvmem/core.c @@ -71,7 +71,7 @@ static int __nvmem_reg_read(struct nvmem_device *nvmem, u= nsigned int offset, } =20 static int __nvmem_reg_write(struct nvmem_device *nvmem, unsigned int offs= et, - void *val, size_t bytes) + const void *val, size_t bytes) { struct nvmem_operations *ops; int ret, wr_ok; @@ -81,14 +81,17 @@ static int __nvmem_reg_write(struct nvmem_device *nvmem= , unsigned int offset, if (!ops) return -ENODEV; =20 - if (!ops->reg_write) + if (!ops->reg_write && !ops->reg_write_const) return -EOPNOTSUPP; =20 ret =3D gpiod_set_value_cansleep(nvmem->wp_gpio, 0); if (ret) return ret; =20 - wr_ok =3D ops->reg_write(nvmem->priv, offset, val, bytes); + if (ops->reg_write_const) + wr_ok =3D ops->reg_write_const(nvmem->priv, offset, val, bytes); + else + wr_ok =3D ops->reg_write(nvmem->priv, offset, (void *)val, bytes); =20 ret =3D gpiod_set_value_cansleep(nvmem->wp_gpio, 1); if (ret) @@ -121,7 +124,7 @@ static int nvmem_access_with_keepouts(struct nvmem_devi= ce *nvmem, kend =3D min(end, keepout->start); ksize =3D kend - offset; if (write) - rc =3D __nvmem_reg_write(nvmem, offset, val, ksize); + rc =3D __nvmem_reg_write(nvmem, offset, (const void *)val, ksize); else rc =3D __nvmem_reg_read(nvmem, offset, val, ksize); =20 @@ -153,7 +156,7 @@ static int nvmem_access_with_keepouts(struct nvmem_devi= ce *nvmem, if (offset < end) { ksize =3D end - offset; if (write) - return __nvmem_reg_write(nvmem, offset, val, ksize); + return __nvmem_reg_write(nvmem, offset, (const void *)val, ksize); else return __nvmem_reg_read(nvmem, offset, val, ksize); } @@ -174,7 +177,7 @@ static int nvmem_reg_write(struct nvmem_device *nvmem, = unsigned int offset, void *val, size_t bytes) { if (!nvmem->nkeepout) - return __nvmem_reg_write(nvmem, offset, val, bytes); + return __nvmem_reg_write(nvmem, offset, (const void *)val, bytes); =20 return nvmem_access_with_keepouts(nvmem, offset, val, bytes, true); } @@ -309,7 +312,7 @@ static umode_t nvmem_bin_attr_get_umode(struct nvmem_de= vice *nvmem) if (!nvmem->read_only) mode |=3D 0200; =20 - if (!ops->reg_write) + if (!ops->reg_write && !ops->reg_write_const) mode &=3D ~0200; =20 if (!ops->reg_read) @@ -346,13 +349,13 @@ static umode_t nvmem_attr_is_visible(struct kobject *= kobj, struct nvmem_operations *ops =3D rcu_dereference_raw(nvmem->ops); =20 /* - * If the device has no .reg_write operation, do not allow - * configuration as read-write. + * If the device has no .reg_write or .reg_write_const operation, do + * not allow configuration as read-write. * If the device is set as read-only by configuration, it * can be forced into read-write mode using the 'force_ro' * attribute. */ - if (attr =3D=3D &dev_attr_force_ro.attr && !ops->reg_write) + if (attr =3D=3D &dev_attr_force_ro.attr && !ops->reg_write && !ops->reg_w= rite_const) return 0; /* Attribute not visible */ =20 return attr->mode; @@ -920,7 +923,7 @@ struct nvmem_device *nvmem_register(const struct nvmem_= config *config) if (!config->dev) return ERR_PTR(-EINVAL); =20 - if (!config->reg_read && !config->reg_write) + if (!config->reg_read && !config->reg_write && !config->reg_write_const) return ERR_PTR(-EINVAL); =20 nvmem =3D kzalloc_obj(*nvmem); @@ -976,6 +979,7 @@ struct nvmem_device *nvmem_register(const struct nvmem_= config *config) =20 ops->reg_read =3D config->reg_read; ops->reg_write =3D config->reg_write; + ops->reg_write_const =3D config->reg_write_const; =20 nvmem->owner =3D config->owner; if (!nvmem->owner && config->dev->driver) @@ -1011,7 +1015,7 @@ struct nvmem_device *nvmem_register(const struct nvme= m_config *config) goto err_put_device; =20 nvmem->read_only =3D device_property_present(config->dev, "read-only") || - config->read_only || !ops->reg_write; + config->read_only || (!ops->reg_write && !ops->reg_write_const); =20 #ifdef CONFIG_NVMEM_SYSFS nvmem->dev.groups =3D nvmem_dev_groups; diff --git a/drivers/nvmem/internals.h b/drivers/nvmem/internals.h index 17418fd0dcc9..41d22f5f2534 100644 --- a/drivers/nvmem/internals.h +++ b/drivers/nvmem/internals.h @@ -12,6 +12,7 @@ struct nvmem_operations { nvmem_reg_read_t reg_read; nvmem_reg_write_t reg_write; + nvmem_reg_write_const_t reg_write_const; }; =20 struct nvmem_device { diff --git a/include/linux/nvmem-provider.h b/include/linux/nvmem-provider.h index f3b13da78aac..c6e77ba1a8c1 100644 --- a/include/linux/nvmem-provider.h +++ b/include/linux/nvmem-provider.h @@ -20,6 +20,8 @@ typedef int (*nvmem_reg_read_t)(void *priv, unsigned int = offset, void *val, size_t bytes); typedef int (*nvmem_reg_write_t)(void *priv, unsigned int offset, void *val, size_t bytes); +typedef int (*nvmem_reg_write_const_t)(void *priv, unsigned int offset, + const void *val, size_t bytes); /* used for vendor specific post processing of cell data */ typedef int (*nvmem_cell_post_process_t)(void *priv, const char *id, int i= ndex, unsigned int offset, void *buf, @@ -93,7 +95,8 @@ struct nvmem_cell_info { * @root_only: Device is accessibly to root only. * @of_node: If given, this will be used instead of the parent's of_node. * @reg_read: Callback to read data; return zero if successful. - * @reg_write: Callback to write data; return zero if successful. + * @reg_write: **DEPRECATED** - please use reg_write_const instead. + * @reg_write_const: Callback to write data; return zero if successful. * @size: Device size. * @word_size: Minimum read/write access granularity. * @stride: Minimum read/write access stride. @@ -128,6 +131,7 @@ struct nvmem_config { struct device_node *of_node; nvmem_reg_read_t reg_read; nvmem_reg_write_t reg_write; + nvmem_reg_write_const_t reg_write_const; int size; int word_size; int stride; --=20 2.55.0 From nobody Sat Jul 25 15:52:31 2026 Received: from luna.linkmauve.fr (82-65-109-163.subs.proxad.net [82.65.109.163]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 966F8423EB8; Thu, 16 Jul 2026 14:24:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=82.65.109.163 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784211874; cv=none; b=rgptlODpDpphIBDQQWwBaQk9WshdwjjjSpdJ4ZwNIPZkNSzLZEmZ+qFbtaG42tDSmLiN6IMhXb5h0Hs6cKqfodm9t2GLS/YnzmH8EX8CYYuFNiP764cFOtbpDMMonjYx+1yGmSAjEoFaiPEkrdrbuavp6eskCAFFSMY4H0JtKXo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784211874; c=relaxed/simple; bh=6Aly6WzjBAliQkZXUkxYt5r9UNhH36l7jSUdD0ZLAS8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=ee9eCapg+IEyOgNwO/RNnXthTGn2L+BZt0KVo6xidLd8PZYjoVo7Ik5hRJ9aDfVwRgwPwrfIl7qTVZNsOlb2W3y1fSwcHrT8KHFlY/DQW+XaZh6cRjUFVcbLUxxuKj13OEmhKnOFbQskc1UpPApXAX4gjrxOe1Hjen7FIT3yeaw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=linkmauve.fr; spf=pass smtp.mailfrom=linkmauve.fr; arc=none smtp.client-ip=82.65.109.163 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=linkmauve.fr Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linkmauve.fr Received: by luna.linkmauve.fr (Postfix, from userid 1000) id B1D7AF40D33; Thu, 16 Jul 2026 16:24:26 +0200 (CEST) From: Link Mauve To: Srinivas Kandagatla Cc: Link Mauve , Andy Shevchenko , Neil Armstrong , Kevin Hilman , Jerome Brunet , Martin Blumenstingl , Sven Peter , Janne Grunau , Neal Gompa , Frank Li , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , Vladimir Zapolskiy , =?UTF-8?q?Andr=C3=A9=20Draszik?= , Orson Zhai , Baolin Wang , Chunyan Zhang , Maxime Coquelin , Alexandre Torgue , Kalyani Akula , Michal Simek , Miguel Ojeda , Boqun Feng , Gary Guo , =?UTF-8?q?Bj=C3=B6rn=20Roy=20Baron?= , Benno Lossin , Andreas Hindborg , Alice Ryhl , Trevor Gross , Danilo Krummrich , Daniel Almeida , Tamir Duberstein , Alexandre Courbot , =?UTF-8?q?Onur=20=C3=96zkan?= , Johan Hovold , Ronald Claveau , Daniel Lezcano , linux-arm-kernel@lists.infradead.org, linux-amlogic@lists.infradead.org, linux-kernel@vger.kernel.org, asahi@lists.linux.dev, imx@lists.linux.dev, linux-arm-msm@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, rust-for-linux@vger.kernel.org Subject: [PATCH v3 2/4] nvmem: make all reg_write callbacks take const void * Date: Thu, 16 Jul 2026 16:24:09 +0200 Message-ID: <20260716142415.28718-3-linkmauve@linkmauve.fr> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260716142415.28718-1-linkmauve@linkmauve.fr> References: <20260716142415.28718-1-linkmauve@linkmauve.fr> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable The previous commit switched from a pointer to mutable data to a pointer to immutable data, so let=E2=80=99s fix all users of this API. Signed-off-by: Link Mauve --- drivers/nvmem/apple-spmi-nvmem.c | 2 +- drivers/nvmem/bcm-ocotp.c | 8 ++++---- drivers/nvmem/imx-ocotp-scu.c | 6 +++--- drivers/nvmem/imx-ocotp.c | 6 +++--- drivers/nvmem/lan9662-otpc.c | 6 +++--- drivers/nvmem/lpc18xx_eeprom.c | 6 +++--- drivers/nvmem/max77759-nvmem.c | 4 ++-- drivers/nvmem/meson-efuse.c | 4 ++-- drivers/nvmem/qcom-spmi-sdam.c | 6 +++--- drivers/nvmem/qfprom.c | 6 +++--- drivers/nvmem/rave-sp-eeprom.c | 6 +++--- drivers/nvmem/snvs_lpgpr.c | 4 ++-- drivers/nvmem/sprd-efuse.c | 6 +++--- drivers/nvmem/stm32-bsec-optee-ta.c | 2 +- drivers/nvmem/stm32-bsec-optee-ta.h | 4 ++-- drivers/nvmem/stm32-romem.c | 10 +++++----- drivers/nvmem/zynqmp_nvmem.c | 6 +++--- 17 files changed, 46 insertions(+), 46 deletions(-) diff --git a/drivers/nvmem/apple-spmi-nvmem.c b/drivers/nvmem/apple-spmi-nv= mem.c index 88614005d5ce..cbf25c53d048 100644 --- a/drivers/nvmem/apple-spmi-nvmem.c +++ b/drivers/nvmem/apple-spmi-nvmem.c @@ -29,7 +29,7 @@ static int apple_spmi_nvmem_probe(struct spmi_device *sde= v) .stride =3D 1, .size =3D 0xffff, .reg_read =3D (void *)regmap_bulk_read, - .reg_write =3D (void *)regmap_bulk_write, + .reg_write_const =3D (void *)regmap_bulk_write, }; =20 regmap =3D devm_regmap_init_spmi_ext(sdev, &apple_spmi_regmap_config); diff --git a/drivers/nvmem/bcm-ocotp.c b/drivers/nvmem/bcm-ocotp.c index 2490f44caa40..02adfd787de8 100644 --- a/drivers/nvmem/bcm-ocotp.c +++ b/drivers/nvmem/bcm-ocotp.c @@ -179,11 +179,11 @@ static int bcm_otpc_read(void *context, unsigned int = offset, void *val, return 0; } =20 -static int bcm_otpc_write(void *context, unsigned int offset, void *val, - size_t bytes) +static int bcm_otpc_write(void *context, unsigned int offset, const void *= val, + size_t bytes) { struct otpc_priv *priv =3D context; - u32 *buf =3D val; + const u32 *buf =3D val; u32 bytes_written; u32 address =3D offset / priv->config->word_size; int i, ret; @@ -223,7 +223,7 @@ static struct nvmem_config bcm_otpc_nvmem_config =3D { .word_size =3D 4, .stride =3D 4, .reg_read =3D bcm_otpc_read, - .reg_write =3D bcm_otpc_write, + .reg_write_const =3D bcm_otpc_write, }; =20 static const struct of_device_id bcm_otpc_dt_ids[] =3D { diff --git a/drivers/nvmem/imx-ocotp-scu.c b/drivers/nvmem/imx-ocotp-scu.c index 517d83e11af2..57008228100f 100644 --- a/drivers/nvmem/imx-ocotp-scu.c +++ b/drivers/nvmem/imx-ocotp-scu.c @@ -178,11 +178,11 @@ static int imx_scu_ocotp_read(void *context, unsigned= int offset, } =20 static int imx_scu_ocotp_write(void *context, unsigned int offset, - void *val, size_t bytes) + const void *val, size_t bytes) { struct ocotp_priv *priv =3D context; struct arm_smccc_res res; - u32 *buf =3D val; + const u32 *buf =3D val; u32 tmp; u32 index; int ret; @@ -226,7 +226,7 @@ static struct nvmem_config imx_scu_ocotp_nvmem_config = =3D { .stride =3D 1, .owner =3D THIS_MODULE, .reg_read =3D imx_scu_ocotp_read, - .reg_write =3D imx_scu_ocotp_write, + .reg_write_const =3D imx_scu_ocotp_write, }; =20 static const struct of_device_id imx_scu_ocotp_dt_ids[] =3D { diff --git a/drivers/nvmem/imx-ocotp.c b/drivers/nvmem/imx-ocotp.c index 108d78d7f6cb..36d4a37aed93 100644 --- a/drivers/nvmem/imx-ocotp.c +++ b/drivers/nvmem/imx-ocotp.c @@ -310,11 +310,11 @@ static void imx_ocotp_set_imx7_timing(struct ocotp_pr= iv *priv) writel(timing, priv->base + IMX_OCOTP_ADDR_TIMING); } =20 -static int imx_ocotp_write(void *context, unsigned int offset, void *val, +static int imx_ocotp_write(void *context, unsigned int offset, const void = *val, size_t bytes) { struct ocotp_priv *priv =3D context; - u32 *buf =3D val; + const u32 *buf =3D val; int ret; =20 u32 ctrl; @@ -483,7 +483,7 @@ static struct nvmem_config imx_ocotp_nvmem_config =3D { .word_size =3D 4, .stride =3D 1, .reg_read =3D imx_ocotp_read, - .reg_write =3D imx_ocotp_write, + .reg_write_const =3D imx_ocotp_write, }; =20 static const struct ocotp_params imx6q_params =3D { diff --git a/drivers/nvmem/lan9662-otpc.c b/drivers/nvmem/lan9662-otpc.c index 62d1d6381bf8..f586ae4cd126 100644 --- a/drivers/nvmem/lan9662-otpc.c +++ b/drivers/nvmem/lan9662-otpc.c @@ -139,10 +139,10 @@ static int lan9662_otp_read(void *context, unsigned i= nt offset, } =20 static int lan9662_otp_write(void *context, unsigned int offset, - void *_val, size_t bytes) + const void *_val, size_t bytes) { struct lan9662_otp *otp =3D context; - u8 *val =3D _val; + const u8 *val =3D _val; u8 data, newdata; int i, rc =3D 0; =20 @@ -174,7 +174,7 @@ static struct nvmem_config otp_config =3D { .stride =3D 1, .word_size =3D 1, .reg_read =3D lan9662_otp_read, - .reg_write =3D lan9662_otp_write, + .reg_write_const =3D lan9662_otp_write, }; =20 static int lan9662_otp_probe(struct platform_device *pdev) diff --git a/drivers/nvmem/lpc18xx_eeprom.c b/drivers/nvmem/lpc18xx_eeprom.c index 504155e30bab..78a35ef095fb 100644 --- a/drivers/nvmem/lpc18xx_eeprom.c +++ b/drivers/nvmem/lpc18xx_eeprom.c @@ -87,7 +87,7 @@ static int lpc18xx_eeprom_busywait_until_prog(struct lpc1= 8xx_eeprom_dev *eeprom) } =20 static int lpc18xx_eeprom_gather_write(void *context, unsigned int reg, - void *val, size_t bytes) + const void *val, size_t bytes) { struct lpc18xx_eeprom_dev *eeprom =3D context; unsigned int offset =3D reg; @@ -109,7 +109,7 @@ static int lpc18xx_eeprom_gather_write(void *context, u= nsigned int reg, usleep_range(100, 200); =20 while (bytes) { - writel(*(u32 *)val, eeprom->mem_base + offset); + writel(*(const u32 *)val, eeprom->mem_base + offset); ret =3D lpc18xx_eeprom_busywait_until_prog(eeprom); if (ret < 0) return ret; @@ -155,7 +155,7 @@ static struct nvmem_config lpc18xx_nvmem_config =3D { .stride =3D 4, .word_size =3D 4, .reg_read =3D lpc18xx_eeprom_read, - .reg_write =3D lpc18xx_eeprom_gather_write, + .reg_write_const =3D lpc18xx_eeprom_gather_write, }; =20 static int lpc18xx_eeprom_probe(struct platform_device *pdev) diff --git a/drivers/nvmem/max77759-nvmem.c b/drivers/nvmem/max77759-nvmem.c index 283000ec3a2c..86c025cfc2f6 100644 --- a/drivers/nvmem/max77759-nvmem.c +++ b/drivers/nvmem/max77759-nvmem.c @@ -59,7 +59,7 @@ static int max77759_nvmem_reg_read(void *priv, unsigned i= nt offset, } =20 static int max77759_nvmem_reg_write(void *priv, unsigned int offset, - void *val, size_t bytes) + const void *val, size_t bytes) { struct max77759_nvmem *nvmem =3D priv; DEFINE_FLEX(struct max77759_maxq_command, cmd, cmd, length, @@ -99,7 +99,7 @@ static int max77759_nvmem_probe(struct platform_device *p= dev) .word_size =3D sizeof(u8), .stride =3D sizeof(u8), .reg_read =3D max77759_nvmem_reg_read, - .reg_write =3D max77759_nvmem_reg_write, + .reg_write_const =3D max77759_nvmem_reg_write, }; struct max77759_nvmem *nvmem; =20 diff --git a/drivers/nvmem/meson-efuse.c b/drivers/nvmem/meson-efuse.c index d7f9ac99a212..c922c5bcbd10 100644 --- a/drivers/nvmem/meson-efuse.c +++ b/drivers/nvmem/meson-efuse.c @@ -27,7 +27,7 @@ static int meson_efuse_read(void *context, unsigned int o= ffset, } =20 static int meson_efuse_write(void *context, unsigned int offset, - void *val, size_t bytes) + const void *val, size_t bytes) { struct meson_sm_firmware *fw =3D context; int ret; @@ -83,7 +83,7 @@ static int meson_efuse_probe(struct platform_device *pdev) econfig->stride =3D 1; econfig->word_size =3D 1; econfig->reg_read =3D meson_efuse_read; - econfig->reg_write =3D meson_efuse_write; + econfig->reg_write_const =3D meson_efuse_write; econfig->size =3D size; econfig->priv =3D fw; =20 diff --git a/drivers/nvmem/qcom-spmi-sdam.c b/drivers/nvmem/qcom-spmi-sdam.c index 4f1cca6eab71..10febaf9e427 100644 --- a/drivers/nvmem/qcom-spmi-sdam.c +++ b/drivers/nvmem/qcom-spmi-sdam.c @@ -81,8 +81,8 @@ static int sdam_read(void *priv, unsigned int offset, voi= d *val, return rc; } =20 -static int sdam_write(void *priv, unsigned int offset, void *val, - size_t bytes) +static int sdam_write(void *priv, unsigned int offset, const void *val, + size_t bytes) { struct sdam_chip *sdam =3D priv; struct device *dev =3D sdam->sdam_config.dev; @@ -147,7 +147,7 @@ static int sdam_probe(struct platform_device *pdev) sdam->sdam_config.size =3D sdam->size; sdam->sdam_config.word_size =3D 1; sdam->sdam_config.reg_read =3D sdam_read; - sdam->sdam_config.reg_write =3D sdam_write; + sdam->sdam_config.reg_write_const =3D sdam_write; sdam->sdam_config.priv =3D sdam; =20 nvmem =3D devm_nvmem_register(&pdev->dev, &sdam->sdam_config); diff --git a/drivers/nvmem/qfprom.c b/drivers/nvmem/qfprom.c index 1de3435df116..16b7f647a3f6 100644 --- a/drivers/nvmem/qfprom.c +++ b/drivers/nvmem/qfprom.c @@ -252,13 +252,13 @@ static int qfprom_enable_fuse_blowing(const struct qf= prom_priv *priv, * * Return: 0 or -err. */ -static int qfprom_reg_write(void *context, unsigned int reg, void *_val, +static int qfprom_reg_write(void *context, unsigned int reg, const void *_= val, size_t bytes) { struct qfprom_priv *priv =3D context; struct qfprom_touched_values old; int words =3D bytes / 4; - u32 *value =3D _val; + const u32 *value =3D _val; u32 blow_status; int ret; int i; @@ -443,7 +443,7 @@ static int qfprom_probe(struct platform_device *pdev) =20 /* Only enable writing if we have SoC data and a valid clock */ if (priv->soc_data && priv->secclk) - econfig.reg_write =3D qfprom_reg_write; + econfig.reg_write_const =3D qfprom_reg_write; } =20 pm_runtime_enable(dev); diff --git a/drivers/nvmem/rave-sp-eeprom.c b/drivers/nvmem/rave-sp-eeprom.c index 9ecf3873cbb7..c703d303eb6c 100644 --- a/drivers/nvmem/rave-sp-eeprom.c +++ b/drivers/nvmem/rave-sp-eeprom.c @@ -278,10 +278,10 @@ static int rave_sp_eeprom_reg_read(void *eeprom, unsi= gned int offset, } =20 static int rave_sp_eeprom_reg_write(void *eeprom, unsigned int offset, - void *val, size_t bytes) + const void *val, size_t bytes) { return rave_sp_eeprom_access(eeprom, RAVE_SP_EEPROM_WRITE, - offset, val, bytes); + offset, (void *)val, bytes); } =20 static int rave_sp_eeprom_probe(struct platform_device *pdev) @@ -331,7 +331,7 @@ static int rave_sp_eeprom_probe(struct platform_device = *pdev) config.add_legacy_fixed_of_cells =3D true; config.size =3D size; config.reg_read =3D rave_sp_eeprom_reg_read; - config.reg_write =3D rave_sp_eeprom_reg_write; + config.reg_write_const =3D rave_sp_eeprom_reg_write; config.word_size =3D 1; config.stride =3D 1; =20 diff --git a/drivers/nvmem/snvs_lpgpr.c b/drivers/nvmem/snvs_lpgpr.c index 89c27112320f..3e76d33dff20 100644 --- a/drivers/nvmem/snvs_lpgpr.c +++ b/drivers/nvmem/snvs_lpgpr.c @@ -50,7 +50,7 @@ static const struct snvs_lpgpr_cfg snvs_lpgpr_cfg_imx7d = =3D { .size =3D 16, }; =20 -static int snvs_lpgpr_write(void *context, unsigned int offset, void *val, +static int snvs_lpgpr_write(void *context, unsigned int offset, const void= *val, size_t bytes) { struct snvs_lpgpr_priv *priv =3D context; @@ -127,7 +127,7 @@ static int snvs_lpgpr_probe(struct platform_device *pde= v) cfg->size =3D dcfg->size; cfg->owner =3D THIS_MODULE; cfg->reg_read =3D snvs_lpgpr_read; - cfg->reg_write =3D snvs_lpgpr_write; + cfg->reg_write_const =3D snvs_lpgpr_write; =20 nvmem =3D devm_nvmem_register(dev, cfg); =20 diff --git a/drivers/nvmem/sprd-efuse.c b/drivers/nvmem/sprd-efuse.c index 1a7e4e5d8b86..f960fa8cb25c 100644 --- a/drivers/nvmem/sprd-efuse.c +++ b/drivers/nvmem/sprd-efuse.c @@ -192,7 +192,7 @@ static void sprd_efuse_set_prog_en(struct sprd_efuse *e= fuse, bool en) } =20 static int sprd_efuse_raw_prog(struct sprd_efuse *efuse, u32 blk, bool dou= b, - bool lock, u32 *data) + bool lock, const u32 *data) { u32 status; int ret =3D 0; @@ -321,7 +321,7 @@ static int sprd_efuse_read(void *context, u32 offset, v= oid *val, size_t bytes) return ret; } =20 -static int sprd_efuse_write(void *context, u32 offset, void *val, size_t b= ytes) +static int sprd_efuse_write(void *context, u32 offset, const void *val, si= ze_t bytes) { struct sprd_efuse *efuse =3D context; bool blk_double =3D efuse->data->blk_double; @@ -410,7 +410,7 @@ static int sprd_efuse_probe(struct platform_device *pde= v) econfig.size =3D efuse->data->blk_nums * SPRD_EFUSE_BLOCK_WIDTH; econfig.add_legacy_fixed_of_cells =3D true; econfig.reg_read =3D sprd_efuse_read; - econfig.reg_write =3D sprd_efuse_write; + econfig.reg_write_const =3D sprd_efuse_write; econfig.priv =3D efuse; econfig.dev =3D &pdev->dev; nvmem =3D devm_nvmem_register(&pdev->dev, &econfig); diff --git a/drivers/nvmem/stm32-bsec-optee-ta.c b/drivers/nvmem/stm32-bsec= -optee-ta.c index f89ce791dd12..3184b976b1f9 100644 --- a/drivers/nvmem/stm32-bsec-optee-ta.c +++ b/drivers/nvmem/stm32-bsec-optee-ta.c @@ -203,7 +203,7 @@ int stm32_bsec_optee_ta_read(struct tee_context *ctx, u= nsigned int offset, =20 /* stm32_bsec_optee_ta_write() - nvmem write access using PTA client drive= r */ int stm32_bsec_optee_ta_write(struct tee_context *ctx, unsigned int lower, - unsigned int offset, void *buf, size_t bytes) + unsigned int offset, const void *buf, size_t bytes) { struct tee_shm *shm; struct tee_ioctl_invoke_arg arg; struct tee_param param[2]; diff --git a/drivers/nvmem/stm32-bsec-optee-ta.h b/drivers/nvmem/stm32-bsec= -optee-ta.h index 3966a0535179..74658a54fe57 100644 --- a/drivers/nvmem/stm32-bsec-optee-ta.h +++ b/drivers/nvmem/stm32-bsec-optee-ta.h @@ -50,7 +50,7 @@ int stm32_bsec_optee_ta_read(struct tee_context *ctx, uns= igned int offset, * On success, 0. On failure, -errno. */ int stm32_bsec_optee_ta_write(struct tee_context *ctx, unsigned int lower, - unsigned int offset, void *buf, size_t bytes); + unsigned int offset, const void *buf, size_t bytes); =20 #else =20 @@ -72,7 +72,7 @@ static inline int stm32_bsec_optee_ta_read(struct tee_con= text *ctx, =20 static inline int stm32_bsec_optee_ta_write(struct tee_context *ctx, unsigned int lower, - unsigned int offset, void *buf, + unsigned int offset, const void *buf, size_t bytes) { return -EOPNOTSUPP; diff --git a/drivers/nvmem/stm32-romem.c b/drivers/nvmem/stm32-romem.c index 82879b1c9eb9..622093b0755c 100644 --- a/drivers/nvmem/stm32-romem.c +++ b/drivers/nvmem/stm32-romem.c @@ -118,12 +118,12 @@ static int stm32_bsec_read(void *context, unsigned in= t offset, void *buf, return 0; } =20 -static int stm32_bsec_write(void *context, unsigned int offset, void *buf, +static int stm32_bsec_write(void *context, unsigned int offset, const void= *buf, size_t bytes) { struct stm32_romem_priv *priv =3D context; struct device *dev =3D priv->cfg.dev; - u32 *buf32 =3D buf; + const u32 *buf32 =3D buf; int ret, i; =20 /* Allow only writing complete 32-bits aligned words */ @@ -153,7 +153,7 @@ static int stm32_bsec_pta_read(void *context, unsigned = int offset, void *buf, return stm32_bsec_optee_ta_read(priv->ctx, offset, buf, bytes); } =20 -static int stm32_bsec_pta_write(void *context, unsigned int offset, void *= buf, +static int stm32_bsec_pta_write(void *context, unsigned int offset, const = void *buf, size_t bytes) { struct stm32_romem_priv *priv =3D context; @@ -239,10 +239,10 @@ static int stm32_romem_probe(struct platform_device *= pdev) return rc; } priv->cfg.reg_read =3D stm32_bsec_pta_read; - priv->cfg.reg_write =3D stm32_bsec_pta_write; + priv->cfg.reg_write_const =3D stm32_bsec_pta_write; } else { priv->cfg.reg_read =3D stm32_bsec_read; - priv->cfg.reg_write =3D stm32_bsec_write; + priv->cfg.reg_write_const =3D stm32_bsec_write; } } =20 diff --git a/drivers/nvmem/zynqmp_nvmem.c b/drivers/nvmem/zynqmp_nvmem.c index d297ff150dc0..54905a608157 100644 --- a/drivers/nvmem/zynqmp_nvmem.c +++ b/drivers/nvmem/zynqmp_nvmem.c @@ -183,7 +183,7 @@ static int zynqmp_nvmem_read(void *context, unsigned in= t offset, void *val, size } =20 static int zynqmp_nvmem_write(void *context, - unsigned int offset, void *val, size_t bytes) + unsigned int offset, const void *val, size_t bytes) { int pufflag =3D 0; =20 @@ -194,7 +194,7 @@ static int zynqmp_nvmem_write(void *context, pufflag =3D 1; =20 return zynqmp_efuse_access(context, offset, - val, bytes, EFUSE_WRITE, pufflag); + (void *)val, bytes, EFUSE_WRITE, pufflag); } =20 static const struct of_device_id zynqmp_nvmem_match[] =3D { @@ -216,7 +216,7 @@ static int zynqmp_nvmem_probe(struct platform_device *p= dev) econfig.priv =3D dev; econfig.add_legacy_fixed_of_cells =3D true; econfig.reg_read =3D zynqmp_nvmem_read; - econfig.reg_write =3D zynqmp_nvmem_write; + econfig.reg_write_const =3D zynqmp_nvmem_write; =20 return PTR_ERR_OR_ZERO(devm_nvmem_register(dev, &econfig)); } --=20 2.55.0 From nobody Sat Jul 25 15:52:31 2026 Received: from luna.linkmauve.fr (82-65-109-163.subs.proxad.net [82.65.109.163]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C2F1F400960; Thu, 16 Jul 2026 14:24:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=82.65.109.163 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784211874; cv=none; b=PWAn0sVDT1JaT8oNsO/KSaaXZXiKlKcfRy/DDsJIZBXw9LgPwaAmTw+lmqeldcpj/J5JAzubb/MDsUZC0qgoHDovfPJh8jAuJkilz4szefwbuj07q6WgUn36xsKdNMM3YvyFxVN9Av4vSCH2jY4mye6iFUuunLgjnm6W8D4hLbY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784211874; c=relaxed/simple; bh=ydMymlYGfsgxt5O4y41wNrCRMcayj9dL4C0MnH/yyCQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=aE0x5CTsus49AqeECQnhnlixUOfwWXIu3Nwx5urLKVGN79v6EC6EokZTn30lv7xGpsR4p7qtaxss2DOp2Kl0GdDcgXSbJh9lzw2Vmxb3thDuFQByAH53qmlqeIxCTJLY/K4jt5ueJlbhPG1fMYRd5gkJmmYnkCxZYChAqS6lYww= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=linkmauve.fr; spf=pass smtp.mailfrom=linkmauve.fr; arc=none smtp.client-ip=82.65.109.163 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=linkmauve.fr Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linkmauve.fr Received: by luna.linkmauve.fr (Postfix, from userid 1000) id 51F28F40D35; Thu, 16 Jul 2026 16:24:28 +0200 (CEST) From: Link Mauve To: Srinivas Kandagatla Cc: Link Mauve , Andy Shevchenko , Neil Armstrong , Kevin Hilman , Jerome Brunet , Martin Blumenstingl , Sven Peter , Janne Grunau , Neal Gompa , Frank Li , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , Vladimir Zapolskiy , =?UTF-8?q?Andr=C3=A9=20Draszik?= , Orson Zhai , Baolin Wang , Chunyan Zhang , Maxime Coquelin , Alexandre Torgue , Kalyani Akula , Michal Simek , Miguel Ojeda , Boqun Feng , Gary Guo , =?UTF-8?q?Bj=C3=B6rn=20Roy=20Baron?= , Benno Lossin , Andreas Hindborg , Alice Ryhl , Trevor Gross , Danilo Krummrich , Daniel Almeida , Tamir Duberstein , Alexandre Courbot , =?UTF-8?q?Onur=20=C3=96zkan?= , Johan Hovold , Ronald Claveau , Daniel Lezcano , linux-arm-kernel@lists.infradead.org, linux-amlogic@lists.infradead.org, linux-kernel@vger.kernel.org, asahi@lists.linux.dev, imx@lists.linux.dev, linux-arm-msm@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, rust-for-linux@vger.kernel.org Subject: [PATCH v3 3/4] nvmem: apple-spmi: improve calling safety with wrapper functions Date: Thu, 16 Jul 2026 16:24:10 +0200 Message-ID: <20260716142415.28718-4-linkmauve@linkmauve.fr> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260716142415.28718-1-linkmauve@linkmauve.fr> References: <20260716142415.28718-1-linkmauve@linkmauve.fr> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" This driver used to cast the regmap_bulk_*() functions to void *, bypassing any compiler safety around incompatible function pointers. With two small wrappers, which just convert the void * priv parameter into the wanted struct regmap *, we can remove the void * cast altogether. Signed-off-by: Link Mauve Reported-by: ? --- drivers/nvmem/apple-spmi-nvmem.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/drivers/nvmem/apple-spmi-nvmem.c b/drivers/nvmem/apple-spmi-nv= mem.c index cbf25c53d048..81d9e242c836 100644 --- a/drivers/nvmem/apple-spmi-nvmem.c +++ b/drivers/nvmem/apple-spmi-nvmem.c @@ -18,6 +18,20 @@ static const struct regmap_config apple_spmi_regmap_conf= ig =3D { .max_register =3D 0xffff, }; =20 +static int apple_spmi_nvmem_read(void *priv, unsigned int offset, + void *val, size_t bytes) +{ + struct regmap *regmap =3D priv; + return regmap_bulk_read(regmap, offset, val, bytes); +} + +static int apple_spmi_nvmem_write(void *priv, unsigned int offset, + const void *val, size_t bytes) +{ + struct regmap *regmap =3D priv; + return regmap_bulk_write(regmap, offset, val, bytes); +} + static int apple_spmi_nvmem_probe(struct spmi_device *sdev) { struct regmap *regmap; @@ -28,8 +42,8 @@ static int apple_spmi_nvmem_probe(struct spmi_device *sde= v) .word_size =3D 1, .stride =3D 1, .size =3D 0xffff, - .reg_read =3D (void *)regmap_bulk_read, - .reg_write_const =3D (void *)regmap_bulk_write, + .reg_read =3D apple_spmi_nvmem_read, + .reg_write_const =3D apple_spmi_nvmem_write, }; =20 regmap =3D devm_regmap_init_spmi_ext(sdev, &apple_spmi_regmap_config); --=20 2.55.0 From nobody Sat Jul 25 15:52:31 2026 Received: from luna.linkmauve.fr (82-65-109-163.subs.proxad.net [82.65.109.163]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DFEDA400982; Thu, 16 Jul 2026 14:24:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=82.65.109.163 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784211873; cv=none; b=ErEbW8tKpyDzHQvNaqLuukmu6+ORt0IaPMnXiu6jZmKcw38dkjJZ7I32C9VULkb/K79mJT/FInUfkkSflax4Oute+0Eg3KIO3+udRxRUIIGh55lKHhYnNrSgVA2GVEiastyRkBlmaxDrbHfLfIQN5NGZ+hkDYkW9crbxkGfA+Z8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784211873; c=relaxed/simple; bh=4oUXBcR6zeOwaBNh+bQp4Z78oNqV2MBaE5uHHU6QNBc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=rhrgKHB8wWlj7daTb+MJ6q2OtoNJ7moAH8FUfHA+wNU+l23MMnr72tjY2/Aa3auEO2d1dYtIuo/TuOFZg83CyIN+LBCvWsgH+WbEOYF9vQNNsi1bp5BxqdoXmCMAfOHdTa2IIpQQZ+Dv5P809dUmmYsC5l0gpide1e53huoP8GY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=linkmauve.fr; spf=pass smtp.mailfrom=linkmauve.fr; arc=none smtp.client-ip=82.65.109.163 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=linkmauve.fr Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linkmauve.fr Received: by luna.linkmauve.fr (Postfix, from userid 1000) id 9B9B3F40D36; Thu, 16 Jul 2026 16:24:29 +0200 (CEST) From: Link Mauve To: Srinivas Kandagatla Cc: Link Mauve , Andy Shevchenko , Neil Armstrong , Kevin Hilman , Jerome Brunet , Martin Blumenstingl , Sven Peter , Janne Grunau , Neal Gompa , Frank Li , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , Vladimir Zapolskiy , =?UTF-8?q?Andr=C3=A9=20Draszik?= , Orson Zhai , Baolin Wang , Chunyan Zhang , Maxime Coquelin , Alexandre Torgue , Kalyani Akula , Michal Simek , Miguel Ojeda , Boqun Feng , Gary Guo , =?UTF-8?q?Bj=C3=B6rn=20Roy=20Baron?= , Benno Lossin , Andreas Hindborg , Alice Ryhl , Trevor Gross , Danilo Krummrich , Daniel Almeida , Tamir Duberstein , Alexandre Courbot , =?UTF-8?q?Onur=20=C3=96zkan?= , Johan Hovold , Ronald Claveau , Daniel Lezcano , linux-arm-kernel@lists.infradead.org, linux-amlogic@lists.infradead.org, linux-kernel@vger.kernel.org, asahi@lists.linux.dev, imx@lists.linux.dev, linux-arm-msm@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, rust-for-linux@vger.kernel.org Subject: [PATCH v3 4/4] firmware: meson: pass a const buffer to meson_sm_call_write() Date: Thu, 16 Jul 2026 16:24:11 +0200 Message-ID: <20260716142415.28718-5-linkmauve@linkmauve.fr> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260716142415.28718-1-linkmauve@linkmauve.fr> References: <20260716142415.28718-1-linkmauve@linkmauve.fr> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable This was found while introducing the new nvmem-provider reg_write_const callback in meson_sm_call_write()=E2=80=99s only user, in meson-efuse. Signed-off-by: Link Mauve --- drivers/firmware/meson/meson_sm.c | 2 +- drivers/nvmem/meson-efuse.c | 4 ++-- include/linux/firmware/meson/meson_sm.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/firmware/meson/meson_sm.c b/drivers/firmware/meson/mes= on_sm.c index ab9751a59b55..5d4da2e3c3a9 100644 --- a/drivers/firmware/meson/meson_sm.c +++ b/drivers/firmware/meson/meson_sm.c @@ -196,7 +196,7 @@ EXPORT_SYMBOL(meson_sm_call_read); * * Return: size of sent data on success, a negative value on error */ -int meson_sm_call_write(struct meson_sm_firmware *fw, void *buffer, +int meson_sm_call_write(struct meson_sm_firmware *fw, const void *buffer, unsigned int size, unsigned int cmd_index, u32 arg0, u32 arg1, u32 arg2, u32 arg3, u32 arg4) { diff --git a/drivers/nvmem/meson-efuse.c b/drivers/nvmem/meson-efuse.c index c922c5bcbd10..5e056e707a96 100644 --- a/drivers/nvmem/meson-efuse.c +++ b/drivers/nvmem/meson-efuse.c @@ -20,7 +20,7 @@ static int meson_efuse_read(void *context, unsigned int o= ffset, struct meson_sm_firmware *fw =3D context; int ret; =20 - ret =3D meson_sm_call_read(fw, (u8 *)val, bytes, SM_EFUSE_READ, offset, + ret =3D meson_sm_call_read(fw, val, bytes, SM_EFUSE_READ, offset, bytes, 0, 0, 0); =20 return ret < 0 ? ret : 0; @@ -32,7 +32,7 @@ static int meson_efuse_write(void *context, unsigned int = offset, struct meson_sm_firmware *fw =3D context; int ret; =20 - ret =3D meson_sm_call_write(fw, (u8 *)val, bytes, SM_EFUSE_WRITE, offset, + ret =3D meson_sm_call_write(fw, val, bytes, SM_EFUSE_WRITE, offset, bytes, 0, 0, 0); =20 return ret < 0 ? ret : 0; diff --git a/include/linux/firmware/meson/meson_sm.h b/include/linux/firmwa= re/meson/meson_sm.h index 3ebc2bd9a976..92cc61f3a1c0 100644 --- a/include/linux/firmware/meson/meson_sm.h +++ b/include/linux/firmware/meson/meson_sm.h @@ -21,7 +21,7 @@ struct meson_sm_firmware; =20 int meson_sm_call(struct meson_sm_firmware *fw, unsigned int cmd_index, s32 *ret, u32 arg0, u32 arg1, u32 arg2, u32 arg3, u32 arg4); -int meson_sm_call_write(struct meson_sm_firmware *fw, void *buffer, +int meson_sm_call_write(struct meson_sm_firmware *fw, const void *buffer, unsigned int b_size, unsigned int cmd_index, u32 arg0, u32 arg1, u32 arg2, u32 arg3, u32 arg4); int meson_sm_call_read(struct meson_sm_firmware *fw, void *buffer, --=20 2.55.0