[PATCH v3 3/4] nvmem: apple-spmi: improve calling safety with wrapper functions
Link Mauve <[email protected]>
| Newsgroups | org.kernel.vger.rust-for-linux,dev.linux.lists.asahi,dev.linux.lists.imx,org.infradead.lists.linux-amlogic,org.infradead.lists.linux-arm-kernel,org.kernel.vger.linux-arm-msm,org.kernel.vger.linux-kernel |
|---|---|
| Message-ID | <[email protected]> |
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 <[email protected]> --- 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-nvmem.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_config = { .max_register = 0xffff, }; +static int apple_spmi_nvmem_read(void *priv, unsigned int offset, + void *val, size_t bytes) +{ + struct regmap *regmap = 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 = 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 *sdev) .word_size = 1, .stride = 1, .size = 0xffff, - .reg_read = (void *)regmap_bulk_read, - .reg_write_const = (void *)regmap_bulk_write, + .reg_read = apple_spmi_nvmem_read, + .reg_write_const = apple_spmi_nvmem_write, }; regmap = devm_regmap_init_spmi_ext(sdev, &apple_spmi_regmap_config); -- 2.55.0