summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLink Mauve <linkmauve@linkmauve.fr>2026-07-26 14:45:30 +0200
committerSakari Ailus <sakari.ailus@linux.intel.com>2026-07-29 15:55:46 +0300
commit665cf662a04b0d87c0095665bc412752144451d0 (patch)
treee798cb2b519e033e7f872f3d5d643d32711aa061
parent84ea27af18695ab5f240ff57acb1d51ad216e89e (diff)
downloadlinux-665cf662a04b0d87c0095665bc412752144451d0.tar.gz
linux-665cf662a04b0d87c0095665bc412752144451d0.zip
media: ov2740: define most fields on variable declaration
This also removes initializing reg_write to NULL, which will help with changing its signature in nvmem-provider[1]. Thanks to Sakari Ailus for their suggestion[2]! [1] https://lore.kernel.org/rust-for-linux/20260716142415.28718-1-linkmauve@linkmauve.fr/ [2] https://lore.kernel.org/rust-for-linux/al3sxMUgeK49dwNs@kekkonen.localdomain/ Signed-off-by: Link Mauve <linkmauve@linkmauve.fr> Suggested-by: Sakari Ailus <sakari.ailus@linux.intel.com> Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
-rw-r--r--drivers/media/i2c/ov2740.c27
1 files changed, 13 insertions, 14 deletions
diff --git a/drivers/media/i2c/ov2740.c b/drivers/media/i2c/ov2740.c
index fb590dfadda1..fbcbadcecebe 100644
--- a/drivers/media/i2c/ov2740.c
+++ b/drivers/media/i2c/ov2740.c
@@ -1246,9 +1246,21 @@ static int ov2740_register_nvmem(struct i2c_client *client,
{
struct nvm_data *nvm;
struct regmap_config regmap_config = { };
- struct nvmem_config nvmem_config = { };
struct regmap *regmap;
struct device *dev = ov2740->dev;
+ struct nvmem_config nvmem_config = {
+ .name = dev_name(dev),
+ .dev = dev,
+ .read_only = true,
+ .root_only = true,
+ .owner = THIS_MODULE,
+ .compat = true,
+ .base_dev = dev,
+ .reg_read = ov2740_nvmem_read,
+ .stride = 1,
+ .word_size = 1,
+ .size = CUSTOMER_USE_OTP_SIZE,
+ };
nvm = devm_kzalloc(dev, sizeof(*nvm), GFP_KERNEL);
if (!nvm)
@@ -1262,20 +1274,7 @@ static int ov2740_register_nvmem(struct i2c_client *client,
return PTR_ERR(regmap);
nvm->regmap = regmap;
-
- nvmem_config.name = dev_name(dev);
- nvmem_config.dev = dev;
- nvmem_config.read_only = true;
- nvmem_config.root_only = true;
- nvmem_config.owner = THIS_MODULE;
- nvmem_config.compat = true;
- nvmem_config.base_dev = dev;
- nvmem_config.reg_read = ov2740_nvmem_read;
- nvmem_config.reg_write = NULL;
nvmem_config.priv = nvm;
- nvmem_config.stride = 1;
- nvmem_config.word_size = 1;
- nvmem_config.size = CUSTOMER_USE_OTP_SIZE;
nvm->nvmem = devm_nvmem_register(dev, &nvmem_config);
if (IS_ERR(nvm->nvmem))