From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753295AbeCPPBk (ORCPT ); Fri, 16 Mar 2018 11:01:40 -0400 Received: from mail-wm0-f68.google.com ([74.125.82.68]:53377 "EHLO mail-wm0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751996AbeCPPBT (ORCPT ); Fri, 16 Mar 2018 11:01:19 -0400 X-Google-Smtp-Source: AG47ELtWWyKQUyXFymbt5gvMD3SGmUy3bTX0R1r/Y4gvVkfcPgmGHHEu3xTg8Xn1KdpCrJATOiwrKQ== From: Jerome Brunet To: Srinivas Kandagatla , Carlo Caione , Kevin Hilman Cc: Jerome Brunet , linux-amlogic@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/2] nvmem: meson-efuse: remove econfig global Date: Fri, 16 Mar 2018 16:01:12 +0100 Message-Id: <20180316150113.9779-2-jbrunet@baylibre.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180316150113.9779-1-jbrunet@baylibre.com> References: <20180316150113.9779-1-jbrunet@baylibre.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 Signed-off-by: Jerome Brunet --- drivers/nvmem/meson-efuse.c | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/drivers/nvmem/meson-efuse.c b/drivers/nvmem/meson-efuse.c index a43c68f90937..7ad80b80b293 100644 --- a/drivers/nvmem/meson-efuse.c +++ b/drivers/nvmem/meson-efuse.c @@ -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 = nvmem_register(&econfig); + nvmem = nvmem_register(econfig); if (IS_ERR(nvmem)) return PTR_ERR(nvmem); -- 2.14.3