From: Carlo Caione <ccaione@baylibre.com>
To: srinivas.kandagatla@linaro.org, khilman@baylibre.com,
narmstrong@baylibre.com, robh+dt@kernel.org, tglx@linutronix.de,
jbrunet@baylibre.com, linux-arm-kernel@lists.infradead.org,
linux-amlogic@lists.infradead.org, devicetree@vger.kernel.org
Cc: Carlo Caione <ccaione@baylibre.com>
Subject: [PATCH 1/5] nvmem: meson-efuse: Move data to a container struct
Date: Mon, 29 Jul 2019 19:39:37 +0100 [thread overview]
Message-ID: <20190729183941.18164-2-ccaione@baylibre.com> (raw)
In-Reply-To: <20190729183941.18164-1-ccaione@baylibre.com>
No functional changes, just a cleanup commit to tidy up a bit. Move the
nvmem_* and clk structures in a container struct.
Signed-off-by: Carlo Caione <ccaione@baylibre.com>
---
drivers/nvmem/meson-efuse.c | 47 ++++++++++++++++++++-----------------
1 file changed, 26 insertions(+), 21 deletions(-)
diff --git a/drivers/nvmem/meson-efuse.c b/drivers/nvmem/meson-efuse.c
index 39bd76306033..9924b98db772 100644
--- a/drivers/nvmem/meson-efuse.c
+++ b/drivers/nvmem/meson-efuse.c
@@ -14,6 +14,12 @@
#include <linux/firmware/meson/meson_sm.h>
+struct meson_efuse {
+ struct nvmem_device *nvmem;
+ struct nvmem_config config;
+ struct clk *clk;
+};
+
static int meson_efuse_read(void *context, unsigned int offset,
void *val, size_t bytes)
{
@@ -37,21 +43,23 @@ 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;
- struct clk *clk;
+ struct meson_efuse *efuse;
unsigned int size;
int ret;
- clk = devm_clk_get(dev, NULL);
- if (IS_ERR(clk)) {
- ret = PTR_ERR(clk);
+ efuse = devm_kzalloc(&pdev->dev, sizeof(*efuse), GFP_KERNEL);
+ if (!efuse)
+ return -ENOMEM;
+
+ efuse->clk = devm_clk_get(dev, NULL);
+ if (IS_ERR(efuse->clk)) {
+ ret = PTR_ERR(efuse->clk);
if (ret != -EPROBE_DEFER)
dev_err(dev, "failed to get efuse gate");
return ret;
}
- ret = clk_prepare_enable(clk);
+ ret = clk_prepare_enable(efuse->clk);
if (ret) {
dev_err(dev, "failed to enable gate");
return ret;
@@ -59,7 +67,7 @@ static int meson_efuse_probe(struct platform_device *pdev)
ret = devm_add_action_or_reset(dev,
(void(*)(void *))clk_disable_unprepare,
- clk);
+ efuse->clk);
if (ret) {
dev_err(dev, "failed to add disable callback");
return ret;
@@ -70,21 +78,18 @@ static int meson_efuse_probe(struct platform_device *pdev)
return -EINVAL;
}
- 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->reg_read = meson_efuse_read;
- econfig->reg_write = meson_efuse_write;
- econfig->size = size;
+ efuse->config.dev = dev;
+ efuse->config.name = dev_name(dev);
+ efuse->config.stride = 1;
+ efuse->config.word_size = 1;
+ efuse->config.reg_read = meson_efuse_read;
+ efuse->config.reg_write = meson_efuse_write;
+ efuse->config.size = size;
+ efuse->config.priv = efuse;
- nvmem = devm_nvmem_register(&pdev->dev, econfig);
+ efuse->nvmem = devm_nvmem_register(&pdev->dev, &efuse->config);
- return PTR_ERR_OR_ZERO(nvmem);
+ return PTR_ERR_OR_ZERO(efuse->nvmem);
}
static struct platform_driver meson_efuse_driver = {
--
2.20.1
next prev parent reply other threads:[~2019-07-29 18:39 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-29 18:39 [PATCH 0/5] Rework secure-monitor driver Carlo Caione
2019-07-29 18:39 ` Carlo Caione [this message]
2019-07-30 9:04 ` [PATCH 1/5] nvmem: meson-efuse: Move data to a container struct Jerome Brunet
2019-07-30 9:29 ` Carlo Caione
2019-07-29 18:39 ` [PATCH 2/5] firmware: meson_sm: Mark chip struct as static const Carlo Caione
2019-07-30 9:05 ` Jerome Brunet
2019-07-29 18:39 ` [PATCH 3/5] nvmem: meson-efuse: bindings: Add secure-monitor phandle Carlo Caione
2019-07-29 18:39 ` [PATCH 4/5] firmware: meson_sm: Rework driver as a proper platform driver Carlo Caione
2019-07-30 9:18 ` Jerome Brunet
2019-07-29 18:39 ` [PATCH 5/5] arm64: dts: meson: Link nvmem and secure-monitor nodes Carlo Caione
2019-07-30 9:23 ` Jerome Brunet
2019-07-30 9:36 ` Carlo Caione
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190729183941.18164-2-ccaione@baylibre.com \
--to=ccaione@baylibre.com \
--cc=devicetree@vger.kernel.org \
--cc=jbrunet@baylibre.com \
--cc=khilman@baylibre.com \
--cc=linux-amlogic@lists.infradead.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=narmstrong@baylibre.com \
--cc=robh+dt@kernel.org \
--cc=srinivas.kandagatla@linaro.org \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).