mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-11-24 04:34:08 +08:00
nvmem: set nvmem->owner to nvmem->dev->driver->owner if unset
All nvmem drivers are supposed to set the owner field of struct nvmem_config, but this matches nvmem->dev->driver->owner. As far as I see in drivers/nvmem/ directory, all the drivers are the case. So, make nvmem_register() set the nvmem's owner to the associated driver's owner unless nvmem_config sets otherwise. Remove .owner settings in the drivers that are now redundant. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
ec3672b81f
commit
17eb18d674
@ -232,7 +232,6 @@ static struct nvmem_config bcm_otpc_nvmem_config = {
|
||||
.read_only = false,
|
||||
.word_size = 4,
|
||||
.stride = 4,
|
||||
.owner = THIS_MODULE,
|
||||
.reg_read = bcm_otpc_read,
|
||||
.reg_write = bcm_otpc_write,
|
||||
};
|
||||
|
@ -462,6 +462,8 @@ struct nvmem_device *nvmem_register(const struct nvmem_config *config)
|
||||
|
||||
nvmem->id = rval;
|
||||
nvmem->owner = config->owner;
|
||||
if (!nvmem->owner && config->dev->driver)
|
||||
nvmem->owner = config->dev->driver->owner;
|
||||
nvmem->stride = config->stride;
|
||||
nvmem->word_size = config->word_size;
|
||||
nvmem->size = config->size;
|
||||
|
@ -133,7 +133,6 @@ static int imx_iim_probe(struct platform_device *pdev)
|
||||
cfg.read_only = true,
|
||||
cfg.word_size = 1,
|
||||
cfg.stride = 1,
|
||||
cfg.owner = THIS_MODULE,
|
||||
cfg.reg_read = imx_iim_read,
|
||||
cfg.dev = dev;
|
||||
cfg.size = drvdata->nregs;
|
||||
|
@ -303,7 +303,6 @@ static struct nvmem_config imx_ocotp_nvmem_config = {
|
||||
.read_only = false,
|
||||
.word_size = 4,
|
||||
.stride = 4,
|
||||
.owner = THIS_MODULE,
|
||||
.reg_read = imx_ocotp_read,
|
||||
.reg_write = imx_ocotp_write,
|
||||
};
|
||||
|
@ -159,7 +159,6 @@ static struct nvmem_config lpc18xx_nvmem_config = {
|
||||
.word_size = 4,
|
||||
.reg_read = lpc18xx_eeprom_read,
|
||||
.reg_write = lpc18xx_eeprom_gather_write,
|
||||
.owner = THIS_MODULE,
|
||||
};
|
||||
|
||||
static int lpc18xx_eeprom_probe(struct platform_device *pdev)
|
||||
|
@ -64,7 +64,6 @@ static struct nvmem_config lpc18xx_otp_nvmem_config = {
|
||||
.read_only = true,
|
||||
.word_size = LPC18XX_OTP_WORD_SIZE,
|
||||
.stride = LPC18XX_OTP_WORD_SIZE,
|
||||
.owner = THIS_MODULE,
|
||||
.reg_read = lpc18xx_otp_read,
|
||||
};
|
||||
|
||||
|
@ -37,7 +37,6 @@ static int meson_efuse_read(void *context, unsigned int offset,
|
||||
|
||||
static struct nvmem_config econfig = {
|
||||
.name = "meson-efuse",
|
||||
.owner = THIS_MODULE,
|
||||
.stride = 1,
|
||||
.word_size = 1,
|
||||
.read_only = true,
|
||||
|
@ -72,7 +72,6 @@ static int mtk_efuse_probe(struct platform_device *pdev)
|
||||
econfig.size = resource_size(res);
|
||||
econfig.priv = priv;
|
||||
econfig.dev = dev;
|
||||
econfig.owner = THIS_MODULE;
|
||||
nvmem = nvmem_register(&econfig);
|
||||
if (IS_ERR(nvmem))
|
||||
return PTR_ERR(nvmem);
|
||||
|
@ -118,7 +118,6 @@ static struct nvmem_config ocotp_config = {
|
||||
.name = "mxs-ocotp",
|
||||
.stride = 16,
|
||||
.word_size = 4,
|
||||
.owner = THIS_MODULE,
|
||||
.reg_read = mxs_ocotp_read,
|
||||
};
|
||||
|
||||
|
@ -56,7 +56,6 @@ static int qfprom_remove(struct platform_device *pdev)
|
||||
|
||||
static struct nvmem_config econfig = {
|
||||
.name = "qfprom",
|
||||
.owner = THIS_MODULE,
|
||||
.stride = 1,
|
||||
.word_size = 1,
|
||||
.reg_read = qfprom_reg_read,
|
||||
|
@ -149,7 +149,6 @@ static int rockchip_rk3399_efuse_read(void *context, unsigned int offset,
|
||||
|
||||
static struct nvmem_config econfig = {
|
||||
.name = "rockchip-efuse",
|
||||
.owner = THIS_MODULE,
|
||||
.stride = 1,
|
||||
.word_size = 1,
|
||||
.read_only = true,
|
||||
|
@ -40,7 +40,6 @@ static struct nvmem_config econfig = {
|
||||
.read_only = true,
|
||||
.stride = 4,
|
||||
.word_size = 1,
|
||||
.owner = THIS_MODULE,
|
||||
};
|
||||
|
||||
struct sunxi_sid_cfg {
|
||||
|
@ -206,7 +206,6 @@ static int vf610_ocotp_read(void *context, unsigned int offset,
|
||||
|
||||
static struct nvmem_config ocotp_config = {
|
||||
.name = "ocotp",
|
||||
.owner = THIS_MODULE,
|
||||
.stride = 4,
|
||||
.word_size = 4,
|
||||
.reg_read = vf610_ocotp_read,
|
||||
|
Loading…
Reference in New Issue
Block a user