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

Commit 01d35cab authored by Masahiro Yamada's avatar Masahiro Yamada Committed by Greg Kroah-Hartman
Browse files

nvmem: imx-iim: use stack for nvmem_config instead of malloc'ing it 



nvmem_register() copies all the members of nvmem_config to
nvmem_device.  So, nvmem_config is one-time use data during
probing.  There is no point to keep it until the driver detach.
Using stack should be no problem because nvmem_config is pretty
small.

Signed-off-by: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: default avatarSrinivas Kandagatla <srinivas.kandagatla@linaro.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a2e37343

drivers/nvmem/imx-iim.c

+12 −15
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ struct imx_iim_drvdata { 
struct iim_priv {

	void __iomem *base;

	struct clk *clk;

	struct nvmem_config nvmem;

};



static int imx_iim_read(void *context, unsigned int offset,
@@ -108,7 +107,7 @@ static int imx_iim_probe(struct platform_device *pdev) 
	struct resource *res;

	struct iim_priv *iim;

	struct nvmem_device *nvmem;

	struct nvmem_config *cfg;

	struct nvmem_config cfg = {};

	const struct imx_iim_drvdata *drvdata = NULL;



	iim = devm_kzalloc(dev, sizeof(*iim), GFP_KERNEL);
@@ -130,19 +129,17 @@ static int imx_iim_probe(struct platform_device *pdev) 
	if (IS_ERR(iim->clk))

		return PTR_ERR(iim->clk);



	cfg = &iim->nvmem;



	cfg->name = "imx-iim",

	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;

	cfg->priv = iim;



	nvmem = nvmem_register(cfg);

	cfg.name = "imx-iim",

	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;

	cfg.priv = iim;



	nvmem = nvmem_register(&cfg);

	if (IS_ERR(nvmem))

		return PTR_ERR(nvmem);