Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/nvmem/meson-efuse.c

+14 −11
Original line number Diff line number Diff line
@@ -35,13 +35,6 @@ static int meson_efuse_read(void *context, unsigned int offset, 
	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[] = {

	{ .compatible = "amlogic,meson-gxbb-efuse", },

	{ /* sentinel */ },
@@ -50,17 +43,27 @@ MODULE_DEVICE_TABLE(of, meson_efuse_match); 


static int meson_efuse_probe(struct platform_device *pdev)

{

	struct device *dev = &pdev->dev;

	struct nvmem_device *nvmem;

	struct nvmem_config *econfig;

	unsigned int size;



	if (meson_sm_call(SM_EFUSE_USER_MAX, &size, 0, 0, 0, 0, 0) < 0)

		return -EINVAL;



	econfig.dev = &pdev->dev;

	econfig.reg_read = meson_efuse_read;

	econfig.size = size;

	econfig = devm_kzalloc(dev, sizeof(*econfig), GFP_KERNEL);

	if (!econfig)

		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);

}