Commit 401488d1 authored by Jerome Brunet's avatar Jerome Brunet Committed by Greg Kroah-Hartman

nvmem: meson-efuse: remove econfig global

Having a global structure holding a reference to the device
structure is not very nice. Allocate the econfig instead and fill
the nvmem information as before
Reviewed-by: default avatarKevin Hilman <khilman@baylibre.com>
Signed-off-by: default avatarJerome Brunet <jbrunet@baylibre.com>
Signed-off-by: default avatarSrinivas Kandagatla <srinivas.kandagatla@linaro.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 3b51f47b
...@@ -35,13 +35,6 @@ static int meson_efuse_read(void *context, unsigned int offset, ...@@ -35,13 +35,6 @@ static int meson_efuse_read(void *context, unsigned int offset,
return 0; return 0;
} }
static struct nvmem_config econfig = {
.name = "meson-efuse",
.stride = 1,
.word_size = 1,
.read_only = true,
};
static const struct of_device_id meson_efuse_match[] = { static const struct of_device_id meson_efuse_match[] = {
{ .compatible = "amlogic,meson-gxbb-efuse", }, { .compatible = "amlogic,meson-gxbb-efuse", },
{ /* sentinel */ }, { /* sentinel */ },
...@@ -50,17 +43,27 @@ MODULE_DEVICE_TABLE(of, meson_efuse_match); ...@@ -50,17 +43,27 @@ MODULE_DEVICE_TABLE(of, meson_efuse_match);
static int meson_efuse_probe(struct platform_device *pdev) static int meson_efuse_probe(struct platform_device *pdev)
{ {
struct device *dev = &pdev->dev;
struct nvmem_device *nvmem; struct nvmem_device *nvmem;
struct nvmem_config *econfig;
unsigned int size; unsigned int size;
if (meson_sm_call(SM_EFUSE_USER_MAX, &size, 0, 0, 0, 0, 0) < 0) if (meson_sm_call(SM_EFUSE_USER_MAX, &size, 0, 0, 0, 0, 0) < 0)
return -EINVAL; return -EINVAL;
econfig.dev = &pdev->dev; econfig = devm_kzalloc(dev, sizeof(*econfig), GFP_KERNEL);
econfig.reg_read = meson_efuse_read; if (!econfig)
econfig.size = size; return -ENOMEM;
econfig->dev = dev;
econfig->name = dev_name(dev);
econfig->stride = 1;
econfig->word_size = 1;
econfig->read_only = true;
econfig->reg_read = meson_efuse_read;
econfig->size = size;
nvmem = devm_nvmem_register(&pdev->dev, &econfig); nvmem = devm_nvmem_register(&pdev->dev, econfig);
return PTR_ERR_OR_ZERO(nvmem); return PTR_ERR_OR_ZERO(nvmem);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment