From patchwork Mon Apr 23 12:41:47 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Brunet X-Patchwork-Id: 133994 Delivered-To: patch@linaro.org Received: by 10.46.151.6 with SMTP id r6csp949984lji; Mon, 23 Apr 2018 05:42:04 -0700 (PDT) X-Google-Smtp-Source: AIpwx493AXKjrrv9tkchpznvxHCMPIRuzdQmIxawWEh0Nnzwiw7hM2jHuj9K3QYMjMA3LNFoWOOu X-Received: by 10.101.101.132 with SMTP id u4mr17270406pgv.260.1524487324543; Mon, 23 Apr 2018 05:42:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1524487324; cv=none; d=google.com; s=arc-20160816; b=I5Hla2XbqIs9Ry4XdnQ4jV70aN2+dixQux4DScKAl5LQJYjm2iY/p/IzxZQqJpxm6g VAtvAtz7NZpxZhpqh0043pHEI26DLHripOrPr4K0XsieGM059CemUy2/Qhh1nhn/Ny1r xH6kLA7O6ja7jdLb242auWx/kSSAV741McflOeULFZT9clEaT0P+ssdLXwigIzeyWsQ+ yDGJ4hYqS1QAGJrk5cUXYETxlQFOwP/4vm7EXUtWZ5kA5l4ggNaDNy8jHqIQWksKFUqb 21hOEMA6ybhDfGMIUwGZzuor7eVI/XnlxHYSP3W58/9GypkzWDalnWL11x/FVf42uwQm ACWA== 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=o3Nfz8TRGBKldp1ZMsDKLhUaER/cVEDFiibMEH4/3I0=; b=Hwq/IBRUNXreRZkecItvNdDR9f6wddrymTfyUTmEehvPqeD20Zkc1gNdZPzOVCOSrH JaQ5VjHkNxtFvgucskOP1BJu/KV2Pyirb1esndnZNcx3p6T3uXk9jMWDC2PliHdYlMu8 0rdq1zqUSnPvPS60ZVcPyLW8v7DcaszcYRS6Hug2fYv/YQL7ZFLj6LqRrhPKlowHa/ex H0YfmeUPaPhWzoOPui+v7VvJ8VUkZEF6bFfhZ7d/xMtzYLhWwqEGqSMp3OXXR9fV7iT1 ozT9VT2pyLy2pZyDykkOsEE+UrrLF2eSkEzBDmCVjDSrqrBviXEt5fgO9Sud3FExzDqt Zvjg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@baylibre-com.20150623.gappssmtp.com header.s=20150623 header.b=xGWlrcoD; 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 s7si9390770pgp.498.2018.04.23.05.42.04; Mon, 23 Apr 2018 05:42:04 -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=xGWlrcoD; 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 S1755124AbeDWMmA (ORCPT + 29 others); Mon, 23 Apr 2018 08:42:00 -0400 Received: from mail-wr0-f194.google.com ([209.85.128.194]:37776 "EHLO mail-wr0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754968AbeDWMlz (ORCPT ); Mon, 23 Apr 2018 08:41:55 -0400 Received: by mail-wr0-f194.google.com with SMTP id c14-v6so748157wrd.4 for ; Mon, 23 Apr 2018 05:41:54 -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=o3Nfz8TRGBKldp1ZMsDKLhUaER/cVEDFiibMEH4/3I0=; b=xGWlrcoD7lNkelRWlJg+JvD1HrU3PYp9MN8gmmmOOu1AP3A4oQY4muheqaXCrO9tp/ iJu2/DLlFBUjPWkWJKwT9TZ4+1JHXnAG9qFmirmQs2SY3FJ8ULeVjp1+H2sKy/pT8MiA vgLluYOGEm3hYDqe2hK5DSE90+txHcPGcIxbNMImAvbHLLLDc/zWdGGSrelrCXz3MRWO yBY2JO+SZMRkNoqQeQ8RYY1mneFPMgR6MptcG75MwIoEBOVBLptQwAiC6jnjp7Q1w+kd VtJ41p2EtRl7IT21zUN0tgPfI9Gh4bub5w2jmsllLuRDtro4lVEmOJ4x2aFpOIDdLEXe 4h9Q== 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=o3Nfz8TRGBKldp1ZMsDKLhUaER/cVEDFiibMEH4/3I0=; b=NbUteCDkN6qVgBT43b1bSzUE0NvoZWlw89h8EHd/sUHnK/Q7B9pcl+XU8g1y0Bbylu tAE7E1PU0AcaT7KDBwExOlq3Kgi8Xrj60pOtTI3FLiQ5TCo2Kexzj08IB6EpTqChcT1v 1icvsyI2JEy2DHLCkJ9tFw4b9FA2ScXF41uCxcO81cDIBWmMCnBKW+YQv/u5opY1xlk1 GVhT0VkdRRed1Fjt13VZ+rEUcEyMDRAfhSBPSFQIht4MM8U5QVj3r7Y6rHH3EtsT8tSi GyNCAE/V5Tt3klG9nyRNGZN5vi7a51GFwrGro7rF6XKK6mAoHfG9EeWRP2gTWI8hDKea Nhvw== X-Gm-Message-State: ALQs6tB+ThD5DRJ347QKhXTzyV+6ItGWRZm7T2atsaOoWRihWw72HkIp BnlI9HClQ76X3hazDkkc2WuykA== X-Received: by 10.28.26.83 with SMTP id a80mr9599474wma.36.1524487314153; Mon, 23 Apr 2018 05:41:54 -0700 (PDT) Received: from boomer.baylibre.local ([90.63.244.31]) by smtp.googlemail.com with ESMTPSA id e202sm8727927wma.43.2018.04.23.05.41.52 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 23 Apr 2018 05:41:53 -0700 (PDT) From: Jerome Brunet To: Srinivas Kandagatla , Carlo Caione , Kevin Hilman Cc: Jerome Brunet , linux-arm-kernel@lists.infradead.org, linux-amlogic@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 1/3] nvmem: meson-efuse: remove econfig global Date: Mon, 23 Apr 2018 14:41:47 +0200 Message-Id: <20180423124149.3077-2-jbrunet@baylibre.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180423124149.3077-1-jbrunet@baylibre.com> References: <20180423124149.3077-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 Reviewed-by: Kevin Hilman 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 71823d1403c5..2df9b0094f45 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 = devm_nvmem_register(&pdev->dev, &econfig); + nvmem = devm_nvmem_register(&pdev->dev, econfig); return PTR_ERR_OR_ZERO(nvmem); }