From patchwork Fri Mar 16 15:01:12 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Brunet X-Patchwork-Id: 131928 Delivered-To: patch@linaro.org Received: by 10.80.152.129 with SMTP id j1csp435902edb; Fri, 16 Mar 2018 08:01:43 -0700 (PDT) X-Google-Smtp-Source: AG47ELv/XaMLgw9ET/kj86GPFpvENiSFaDVNfn13CMMtXg90dbtGggHTZX3ywpDtGjLnp0ZMBvt2 X-Received: by 10.98.218.7 with SMTP id c7mr1839775pfh.162.1521212503483; Fri, 16 Mar 2018 08:01:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521212503; cv=none; d=google.com; s=arc-20160816; b=YCg499R5sFbO6xW1lhGiQSa9B0GEoN8W+ZpCxC1qzGLfXO1ZMBuH00M7nQaIE8cI5O n/MNLrMqw0zbC/gOBFF41uywIpIkLomC9wwSP3U2yqmxsfWXUuwuUpi/5qVtdliP5I3K YR/koSueG7Me1cWQy0UUX8GxlzdiwHWyDIZ0MSIlKTVRez6r/fNVhIx+z/H0x8dXqCds hVZ08KfsbSu/HWv11yaJm4pIFvDHF4SUs5elLJz9V7u86V8g39FVgt/P8vdTO4KdjMYj Vzg0W62Z5g387GlOCZH6RTIARvax/uyC+8y1pQ6wfpINPo1LZGsoAZ/khyQ6ayLtAemb +uKQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=B2jcKIe+YKwXTwZIfc0ZK9dYadpk0db8nf+MWWmbcHY=; b=tRdLaVyh/0/Mv2dsQBA0w7uEqONAqPRwAUHap3tX9Cs8cGFLC+UHvkX+bWT0+9oSEX 5hI0//i2rMf5toEzGw8utFy/PE6htmYm2e5xlr+bhuCLGtoXCNii4LrypXCWNPVYnCtK uV55aOzzQvaJB7sgSqBETvm6yNR00HNTWMhEYGNOo/z0bw/uPnFuxvgDMZruZquuGitP 2ISOaB+voVrRN45XwQ0/UegbeegtqdSmPONG16YsrtKmb6tW1kj17S5RHsgftvTh7qZj ofeLvEzXpog3zh92PYPQZyK9ncxecjSRY9kYoyEtLBRpF+v5jFcWE8wcgnSV2R7wxZ9l QLWA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@baylibre-com.20150623.gappssmtp.com header.s=20150623 header.b=xJwIk1Fp; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id o1-v6si6393064pld.546.2018.03.16.08.01.42; Fri, 16 Mar 2018 08:01:43 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@baylibre-com.20150623.gappssmtp.com header.s=20150623 header.b=xJwIk1Fp; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753296AbeCPPBk (ORCPT + 28 others); 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 Received: by mail-wm0-f68.google.com with SMTP id e194so3576513wmd.3 for ; Fri, 16 Mar 2018 08:01:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=B2jcKIe+YKwXTwZIfc0ZK9dYadpk0db8nf+MWWmbcHY=; b=xJwIk1FpDlzb4BbvCIYNd9OG6hhQZy0vSkl9NFdqoFOupzTcpANKrmcuhFad4QxQVc FMNI8PLLKkHKGbdGVUftj9D6C+s8IKTVnJx3JjFANdMctPRrWJsfXEVofUayxRym+f8B OOqWBHajGbkn0jO7BzfNPdoSW9mKInx7Pd1NJzaqLkyx+zVive9pMQ02xF/xEQ0aYb/W nx+SNo5uWbAFXzWsLI9Me13Jp8aZAg3bfSbI/fzlJSQVNnKtDzb+GSz5/pCCHDAMBa3+ iyCt79fCDae/nrgl3JZDoVjHjiG0PxzDoDwxsf1k/ZxPGk2jbp0anWYWpEcWpxk3xNSc LdqA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=B2jcKIe+YKwXTwZIfc0ZK9dYadpk0db8nf+MWWmbcHY=; b=UOtyjqma40xHKjsrXsNiG7pziNms/9xVpzo77gby8QofNnT8l7KukcMmQM49g9XYQ+ P5yhYFjpvPYFwuppozDT0vPtLoelKN09k65DI1Cikw379158lqQyVyp1HFVGRUSgrE4Q i+rkPEV7EEggcxKPa624upjes28lEa3Vw8WCqER92MyMxEL2mW/2odLLTD5080VUwV/2 QmKEz1xgknwBE+JJR36DIZ4JoDUqe1hTB7IcV43dfk1mt9EKaXfEmrLlUjI4Jf7eAJ4W 0appfGD1D918eMsv0f0asCa2OlkHhmTxr2qH0S2UW3eDhaJymguH0l+BnHSvrSTfSJmS As1Q== X-Gm-Message-State: AElRT7FNKRaxGLxKK+buGnHxqiK6svLowzQPOIheTGhBDEM4utTE7WjH HwXUtyAUtrjshzOTmJwGvN4i7A== X-Received: by 10.28.164.3 with SMTP id n3mr2138965wme.121.1521212477922; Fri, 16 Mar 2018 08:01:17 -0700 (PDT) Received: from boomer.baylibre.local ([90.63.244.31]) by smtp.googlemail.com with ESMTPSA id f84sm2348834wmh.44.2018.03.16.08.01.16 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 16 Mar 2018 08:01:17 -0700 (PDT) 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 Precedence: bulk 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(-) -- 2.14.3 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);