* [PATCH 00/20] Verbatim device names and devm_nvmem_(un)register()
@ 2017-12-27 22:59 Andrey Smirnov
2017-12-27 22:59 ` [PATCH 01/20] nvmem: core: Allow specifying device name verbatim Andrey Smirnov
` (19 more replies)
0 siblings, 20 replies; 22+ messages in thread
From: Andrey Smirnov @ 2017-12-27 22:59 UTC (permalink / raw)
To: linux-arm-kernel
Srinivas, all:
This patchset contains various small changes that I recently made to
NVMEM, more specifically:
- Patches 1 and 2 are two changes I am hoping are acceptable upstream
- Patches 3 to 14 are a follow up to patch 2
- Patches 15 to 20 are just trivial fixups and I am more than happy
to drop them if they seem to add more pointless churn rather then
value.
Feedback is appreciated!
Thanks,
Andrey Smirnov
Andrey Smirnov (20):
nvmem: core: Allow specifying device name verbatim
nvmem: Introduce devm_nvmem_(un)register()
nvmem: vf610-ocotp: Convert to use devm_nvmem_register()
nvmem: imx-ocotp: Convert to use devm_nvmem_register()
nvmem: uniphier-efuse: Convert to use devm_nvmem_register()
nvmem: snvs_lgpr: Convert to use devm_nvmem_register()
nvmem: rockchip-efuse: Convert to use devm_nvmem_register()
nvmem: qfprom: Convert to use devm_nvmem_register()
nvmem: mtk-efuse: Convert to use devm_nvmem_register()
nvmem: meson-mx-efuse: Convert to use devm_nvmem_register()
nvmem: meson-efuse: Convert to use devm_nvmem_register()
nvmem: lpc18xx_otp: Convert to use devm_nvmem_register()
nvmem: imx-iim: Convert to use devm_nvmem_register()
nvmem: bcm-ocotp: Convert to use devm_nvmem_register()
nvmem: snvs_lpgpr: Convert commas to semicolons
nvmem: rockchip-efuse: Make use of of_device_get_match_data()
nvmem: vf610-ocotp: Do not use "&pdev->dev" explicitly
nvmem: rockchip-efuse: Do not use "&pdev->dev" explicitly
nvmem: imx-iim: Do not use "&pdev->dev" explicitly
nvmem: bcm-ocotp: Do not use "&pdev->dev" explicitly
drivers/nvmem/bcm-ocotp.c | 15 ++----------
drivers/nvmem/core.c | 52 +++++++++++++++++++++++++++++++++++++++---
drivers/nvmem/imx-iim.c | 14 ++----------
drivers/nvmem/imx-ocotp.c | 12 +---------
drivers/nvmem/lpc18xx_otp.c | 12 +---------
drivers/nvmem/meson-efuse.c | 11 +--------
drivers/nvmem/meson-mx-efuse.c | 12 +---------
drivers/nvmem/mtk-efuse.c | 12 +---------
drivers/nvmem/qfprom.c | 12 +---------
drivers/nvmem/rockchip-efuse.c | 28 ++++++++---------------
drivers/nvmem/snvs_lpgpr.c | 26 +++++++--------------
drivers/nvmem/uniphier-efuse.c | 12 +---------
drivers/nvmem/vf610-ocotp.c | 15 ++----------
include/linux/nvmem-provider.h | 17 ++++++++++++++
14 files changed, 96 insertions(+), 154 deletions(-)
--
2.14.3
^ permalink raw reply [flat|nested] 22+ messages in thread
* [PATCH 01/20] nvmem: core: Allow specifying device name verbatim
2017-12-27 22:59 [PATCH 00/20] Verbatim device names and devm_nvmem_(un)register() Andrey Smirnov
@ 2017-12-27 22:59 ` Andrey Smirnov
2017-12-27 22:59 ` [PATCH 02/20] nvmem: Introduce devm_nvmem_(un)register() Andrey Smirnov
` (18 subsequent siblings)
19 siblings, 0 replies; 22+ messages in thread
From: Andrey Smirnov @ 2017-12-27 22:59 UTC (permalink / raw)
To: linux-arm-kernel
Add code to allow avoid having nvmem core append a numeric suffix to
the end of the name by passing config->id of -1.
Cc: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Cc: Heiko Stuebner <heiko@sntech.de>
Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
Cc: Carlo Caione <carlo@caione.org>
Cc: Kevin Hilman <khilman@baylibre.com>
Cc: Matthias Brugger <matthias.bgg@gmail.com>
Cc: Joachim Eastwood <manabian@gmail.com>
Cc: cphealy at gmail.com
Cc: linux-kernel at vger.kernel.org
Cc: linux-mediatek at lists.infradead.org
Cc: linux-rockchip at lists.infradead.org
Cc: linux-amlogic at lists.infradead.org
Cc: linux-arm-kernel at lists.infradead.org
Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
---
drivers/nvmem/core.c | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c
index 5a5cefd12153..57cbeacfbeb2 100644
--- a/drivers/nvmem/core.c
+++ b/drivers/nvmem/core.c
@@ -475,9 +475,14 @@ struct nvmem_device *nvmem_register(const struct nvmem_config *config)
nvmem->reg_write = config->reg_write;
np = config->dev->of_node;
nvmem->dev.of_node = np;
- dev_set_name(&nvmem->dev, "%s%d",
- config->name ? : "nvmem",
- config->name ? config->id : nvmem->id);
+
+ if (config->id == -1 && config->name) {
+ dev_set_name(&nvmem->dev, "%s", config->name);
+ } else {
+ dev_set_name(&nvmem->dev, "%s%d",
+ config->name ? : "nvmem",
+ config->name ? config->id : nvmem->id);
+ }
nvmem->read_only = of_property_read_bool(np, "read-only") |
config->read_only;
--
2.14.3
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [PATCH 02/20] nvmem: Introduce devm_nvmem_(un)register()
2017-12-27 22:59 [PATCH 00/20] Verbatim device names and devm_nvmem_(un)register() Andrey Smirnov
2017-12-27 22:59 ` [PATCH 01/20] nvmem: core: Allow specifying device name verbatim Andrey Smirnov
@ 2017-12-27 22:59 ` Andrey Smirnov
2017-12-27 22:59 ` [PATCH 03/20] nvmem: vf610-ocotp: Convert to use devm_nvmem_register() Andrey Smirnov
` (17 subsequent siblings)
19 siblings, 0 replies; 22+ messages in thread
From: Andrey Smirnov @ 2017-12-27 22:59 UTC (permalink / raw)
To: linux-arm-kernel
Introduce devm_nvmem_register()/devm_nvmem_unregister() to make
.remove() unnecessary in trivial drivers.
Cc: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Cc: Heiko Stuebner <heiko@sntech.de>
Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
Cc: Carlo Caione <carlo@caione.org>
Cc: Kevin Hilman <khilman@baylibre.com>
Cc: Matthias Brugger <matthias.bgg@gmail.com>
Cc: Joachim Eastwood <manabian@gmail.com>
Cc: cphealy at gmail.com
Cc: linux-kernel at vger.kernel.org
Cc: linux-mediatek at lists.infradead.org
Cc: linux-rockchip at lists.infradead.org
Cc: linux-amlogic at lists.infradead.org
Cc: linux-arm-kernel at lists.infradead.org
Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
---
drivers/nvmem/core.c | 41 +++++++++++++++++++++++++++++++++++++++++
include/linux/nvmem-provider.h | 17 +++++++++++++++++
2 files changed, 58 insertions(+)
diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c
index 57cbeacfbeb2..84f07ba1f36d 100644
--- a/drivers/nvmem/core.c
+++ b/drivers/nvmem/core.c
@@ -551,6 +551,47 @@ int nvmem_unregister(struct nvmem_device *nvmem)
}
EXPORT_SYMBOL_GPL(nvmem_unregister);
+static void devm_nvmem_release(struct device *dev, void *res)
+{
+ WARN_ON(nvmem_unregister(*(struct nvmem_device **)res));
+}
+
+struct nvmem_device *devm_nvmem_register(struct device *dev,
+ const struct nvmem_config *config)
+{
+ struct nvmem_device **ptr, *nvmem;
+
+ ptr = devres_alloc(devm_nvmem_release, sizeof(*ptr), GFP_KERNEL);
+ if (!ptr)
+ return ERR_PTR(-ENOMEM);
+
+ nvmem = nvmem_register(config);
+
+ if (!IS_ERR(nvmem)) {
+ *ptr = nvmem;
+ devres_add(dev, ptr);
+ } else {
+ devres_free(ptr);
+ }
+
+ return nvmem;
+}
+EXPORT_SYMBOL_GPL(devm_nvmem_register);
+
+static int devm_nvmem_match(struct device *dev, void *res, void *data)
+{
+ struct nvmem_device **r = res;
+
+ return *r == data;
+}
+
+int devm_nvmem_unregister(struct device *dev, struct nvmem_device *nvmem)
+{
+ return devres_release(dev, devm_nvmem_release, devm_nvmem_match, nvmem);
+}
+EXPORT_SYMBOL(devm_nvmem_unregister);
+
+
static struct nvmem_device *__nvmem_device_get(struct device_node *np,
struct nvmem_cell **cellp,
const char *cell_id)
diff --git a/include/linux/nvmem-provider.h b/include/linux/nvmem-provider.h
index 497706f5adca..493f2f529f00 100644
--- a/include/linux/nvmem-provider.h
+++ b/include/linux/nvmem-provider.h
@@ -47,6 +47,11 @@ struct nvmem_config {
struct nvmem_device *nvmem_register(const struct nvmem_config *cfg);
int nvmem_unregister(struct nvmem_device *nvmem);
+struct nvmem_device *devm_nvmem_register(struct device *dev,
+ const struct nvmem_config *cfg);
+
+int devm_nvmem_unregister(struct device *dev, struct nvmem_device *nvmem);
+
#else
static inline struct nvmem_device *nvmem_register(const struct nvmem_config *c)
@@ -59,5 +64,17 @@ static inline int nvmem_unregister(struct nvmem_device *nvmem)
return -ENOSYS;
}
+static inline struct nvmem_device *
+devm_nvmem_register(struct device *dev, const struct nvmem_config *c)
+{
+ return nvmem_register(c);
+}
+
+static inline int
+devm_nvmem_unregister(struct device *dev, struct nvmem_device *nvmem)
+{
+ return nvmem_unregister(nvmem);
+}
+
#endif /* CONFIG_NVMEM */
#endif /* ifndef _LINUX_NVMEM_PROVIDER_H */
--
2.14.3
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [PATCH 03/20] nvmem: vf610-ocotp: Convert to use devm_nvmem_register()
2017-12-27 22:59 [PATCH 00/20] Verbatim device names and devm_nvmem_(un)register() Andrey Smirnov
2017-12-27 22:59 ` [PATCH 01/20] nvmem: core: Allow specifying device name verbatim Andrey Smirnov
2017-12-27 22:59 ` [PATCH 02/20] nvmem: Introduce devm_nvmem_(un)register() Andrey Smirnov
@ 2017-12-27 22:59 ` Andrey Smirnov
2017-12-27 22:59 ` [PATCH 04/20] nvmem: imx-ocotp: " Andrey Smirnov
` (16 subsequent siblings)
19 siblings, 0 replies; 22+ messages in thread
From: Andrey Smirnov @ 2017-12-27 22:59 UTC (permalink / raw)
To: linux-arm-kernel
Drop all of the code related to .remove hook and make use of
devm_nvmem_register() instead.
Cc: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Cc: Heiko Stuebner <heiko@sntech.de>
Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
Cc: Carlo Caione <carlo@caione.org>
Cc: Kevin Hilman <khilman@baylibre.com>
Cc: Matthias Brugger <matthias.bgg@gmail.com>
Cc: Joachim Eastwood <manabian@gmail.com>
Cc: cphealy at gmail.com
Cc: linux-kernel at vger.kernel.org
Cc: linux-mediatek at lists.infradead.org
Cc: linux-rockchip at lists.infradead.org
Cc: linux-amlogic at lists.infradead.org
Cc: linux-arm-kernel at lists.infradead.org
Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
---
drivers/nvmem/vf610-ocotp.c | 12 +-----------
1 file changed, 1 insertion(+), 11 deletions(-)
diff --git a/drivers/nvmem/vf610-ocotp.c b/drivers/nvmem/vf610-ocotp.c
index 5ae9e002f195..752a0983e7fb 100644
--- a/drivers/nvmem/vf610-ocotp.c
+++ b/drivers/nvmem/vf610-ocotp.c
@@ -217,13 +217,6 @@ static const struct of_device_id ocotp_of_match[] = {
};
MODULE_DEVICE_TABLE(of, ocotp_of_match);
-static int vf610_ocotp_remove(struct platform_device *pdev)
-{
- struct vf610_ocotp *ocotp_dev = platform_get_drvdata(pdev);
-
- return nvmem_unregister(ocotp_dev->nvmem);
-}
-
static int vf610_ocotp_probe(struct platform_device *pdev)
{
struct device *dev = &pdev->dev;
@@ -251,13 +244,11 @@ static int vf610_ocotp_probe(struct platform_device *pdev)
ocotp_config.priv = ocotp_dev;
ocotp_config.dev = dev;
- ocotp_dev->nvmem = nvmem_register(&ocotp_config);
+ ocotp_dev->nvmem = devm_nvmem_register(dev, &ocotp_config);
if (IS_ERR(ocotp_dev->nvmem))
return PTR_ERR(ocotp_dev->nvmem);
ocotp_dev->dev = dev;
- platform_set_drvdata(pdev, ocotp_dev);
-
ocotp_dev->timing = vf610_ocotp_calculate_timing(ocotp_dev);
return 0;
@@ -265,7 +256,6 @@ static int vf610_ocotp_probe(struct platform_device *pdev)
static struct platform_driver vf610_ocotp_driver = {
.probe = vf610_ocotp_probe,
- .remove = vf610_ocotp_remove,
.driver = {
.name = "vf610-ocotp",
.of_match_table = ocotp_of_match,
--
2.14.3
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [PATCH 04/20] nvmem: imx-ocotp: Convert to use devm_nvmem_register()
2017-12-27 22:59 [PATCH 00/20] Verbatim device names and devm_nvmem_(un)register() Andrey Smirnov
` (2 preceding siblings ...)
2017-12-27 22:59 ` [PATCH 03/20] nvmem: vf610-ocotp: Convert to use devm_nvmem_register() Andrey Smirnov
@ 2017-12-27 22:59 ` Andrey Smirnov
2017-12-27 22:59 ` [PATCH 05/20] nvmem: uniphier-efuse: " Andrey Smirnov
` (15 subsequent siblings)
19 siblings, 0 replies; 22+ messages in thread
From: Andrey Smirnov @ 2017-12-27 22:59 UTC (permalink / raw)
To: linux-arm-kernel
Drop all of the code related to .remove hook and make use of
devm_nvmem_register() instead.
Cc: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Cc: Heiko Stuebner <heiko@sntech.de>
Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
Cc: Carlo Caione <carlo@caione.org>
Cc: Kevin Hilman <khilman@baylibre.com>
Cc: Matthias Brugger <matthias.bgg@gmail.com>
Cc: Joachim Eastwood <manabian@gmail.com>
Cc: cphealy at gmail.com
Cc: linux-kernel at vger.kernel.org
Cc: linux-mediatek at lists.infradead.org
Cc: linux-rockchip at lists.infradead.org
Cc: linux-amlogic at lists.infradead.org
Cc: linux-arm-kernel at lists.infradead.org
Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
---
drivers/nvmem/imx-ocotp.c | 12 +-----------
1 file changed, 1 insertion(+), 11 deletions(-)
diff --git a/drivers/nvmem/imx-ocotp.c b/drivers/nvmem/imx-ocotp.c
index d7ba351a70c9..68deffe636f3 100644
--- a/drivers/nvmem/imx-ocotp.c
+++ b/drivers/nvmem/imx-ocotp.c
@@ -466,26 +466,16 @@ static int imx_ocotp_probe(struct platform_device *pdev)
imx_ocotp_nvmem_config.dev = dev;
imx_ocotp_nvmem_config.priv = priv;
priv->config = &imx_ocotp_nvmem_config;
- nvmem = nvmem_register(&imx_ocotp_nvmem_config);
+ nvmem = devm_nvmem_register(dev, &imx_ocotp_nvmem_config);
if (IS_ERR(nvmem))
return PTR_ERR(nvmem);
- platform_set_drvdata(pdev, nvmem);
-
return 0;
}
-static int imx_ocotp_remove(struct platform_device *pdev)
-{
- struct nvmem_device *nvmem = platform_get_drvdata(pdev);
-
- return nvmem_unregister(nvmem);
-}
-
static struct platform_driver imx_ocotp_driver = {
.probe = imx_ocotp_probe,
- .remove = imx_ocotp_remove,
.driver = {
.name = "imx_ocotp",
.of_match_table = imx_ocotp_dt_ids,
--
2.14.3
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [PATCH 05/20] nvmem: uniphier-efuse: Convert to use devm_nvmem_register()
2017-12-27 22:59 [PATCH 00/20] Verbatim device names and devm_nvmem_(un)register() Andrey Smirnov
` (3 preceding siblings ...)
2017-12-27 22:59 ` [PATCH 04/20] nvmem: imx-ocotp: " Andrey Smirnov
@ 2017-12-27 22:59 ` Andrey Smirnov
2017-12-27 22:59 ` [PATCH 06/20] nvmem: snvs_lgpr: " Andrey Smirnov
` (14 subsequent siblings)
19 siblings, 0 replies; 22+ messages in thread
From: Andrey Smirnov @ 2017-12-27 22:59 UTC (permalink / raw)
To: linux-arm-kernel
Drop all of the code related to .remove hook and make use of
devm_nvmem_register() instead.
Cc: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Cc: Heiko Stuebner <heiko@sntech.de>
Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
Cc: Carlo Caione <carlo@caione.org>
Cc: Kevin Hilman <khilman@baylibre.com>
Cc: Matthias Brugger <matthias.bgg@gmail.com>
Cc: Joachim Eastwood <manabian@gmail.com>
Cc: cphealy at gmail.com
Cc: linux-kernel at vger.kernel.org
Cc: linux-mediatek at lists.infradead.org
Cc: linux-rockchip at lists.infradead.org
Cc: linux-amlogic at lists.infradead.org
Cc: linux-arm-kernel at lists.infradead.org
Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
---
drivers/nvmem/uniphier-efuse.c | 12 +-----------
1 file changed, 1 insertion(+), 11 deletions(-)
diff --git a/drivers/nvmem/uniphier-efuse.c b/drivers/nvmem/uniphier-efuse.c
index 9d278b4e1dc7..7ddc6fc012c9 100644
--- a/drivers/nvmem/uniphier-efuse.c
+++ b/drivers/nvmem/uniphier-efuse.c
@@ -60,22 +60,13 @@ static int uniphier_efuse_probe(struct platform_device *pdev)
econfig.size = resource_size(res);
econfig.priv = priv;
econfig.dev = dev;
- nvmem = nvmem_register(&econfig);
+ nvmem = devm_nvmem_register(dev, &econfig);
if (IS_ERR(nvmem))
return PTR_ERR(nvmem);
- platform_set_drvdata(pdev, nvmem);
-
return 0;
}
-static int uniphier_efuse_remove(struct platform_device *pdev)
-{
- struct nvmem_device *nvmem = platform_get_drvdata(pdev);
-
- return nvmem_unregister(nvmem);
-}
-
static const struct of_device_id uniphier_efuse_of_match[] = {
{ .compatible = "socionext,uniphier-efuse",},
{/* sentinel */},
@@ -84,7 +75,6 @@ MODULE_DEVICE_TABLE(of, uniphier_efuse_of_match);
static struct platform_driver uniphier_efuse_driver = {
.probe = uniphier_efuse_probe,
- .remove = uniphier_efuse_remove,
.driver = {
.name = "uniphier-efuse",
.of_match_table = uniphier_efuse_of_match,
--
2.14.3
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [PATCH 06/20] nvmem: snvs_lgpr: Convert to use devm_nvmem_register()
2017-12-27 22:59 [PATCH 00/20] Verbatim device names and devm_nvmem_(un)register() Andrey Smirnov
` (4 preceding siblings ...)
2017-12-27 22:59 ` [PATCH 05/20] nvmem: uniphier-efuse: " Andrey Smirnov
@ 2017-12-27 22:59 ` Andrey Smirnov
2017-12-27 22:59 ` [PATCH 07/20] nvmem: rockchip-efuse: " Andrey Smirnov
` (13 subsequent siblings)
19 siblings, 0 replies; 22+ messages in thread
From: Andrey Smirnov @ 2017-12-27 22:59 UTC (permalink / raw)
To: linux-arm-kernel
Drop all of the code related to .remove hook and make use of
devm_nvmem_register() instead.
Cc: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Cc: Heiko Stuebner <heiko@sntech.de>
Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
Cc: Carlo Caione <carlo@caione.org>
Cc: Kevin Hilman <khilman@baylibre.com>
Cc: Matthias Brugger <matthias.bgg@gmail.com>
Cc: Joachim Eastwood <manabian@gmail.com>
Cc: cphealy at gmail.com
Cc: linux-kernel at vger.kernel.org
Cc: linux-mediatek at lists.infradead.org
Cc: linux-rockchip at lists.infradead.org
Cc: linux-amlogic at lists.infradead.org
Cc: linux-arm-kernel at lists.infradead.org
Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
---
drivers/nvmem/snvs_lpgpr.c | 12 +-----------
1 file changed, 1 insertion(+), 11 deletions(-)
diff --git a/drivers/nvmem/snvs_lpgpr.c b/drivers/nvmem/snvs_lpgpr.c
index e5c2a4a17f03..6a2fdd09e74a 100644
--- a/drivers/nvmem/snvs_lpgpr.c
+++ b/drivers/nvmem/snvs_lpgpr.c
@@ -117,22 +117,13 @@ static int snvs_lpgpr_probe(struct platform_device *pdev)
cfg->reg_read = snvs_lpgpr_read,
cfg->reg_write = snvs_lpgpr_write,
- nvmem = nvmem_register(cfg);
+ nvmem = devm_nvmem_register(dev, cfg);
if (IS_ERR(nvmem))
return PTR_ERR(nvmem);
- platform_set_drvdata(pdev, nvmem);
-
return 0;
}
-static int snvs_lpgpr_remove(struct platform_device *pdev)
-{
- struct nvmem_device *nvmem = platform_get_drvdata(pdev);
-
- return nvmem_unregister(nvmem);
-}
-
static const struct of_device_id snvs_lpgpr_dt_ids[] = {
{ .compatible = "fsl,imx6q-snvs-lpgpr", .data = &snvs_lpgpr_cfg_imx6q },
{ .compatible = "fsl,imx6ul-snvs-lpgpr",
@@ -143,7 +134,6 @@ MODULE_DEVICE_TABLE(of, snvs_lpgpr_dt_ids);
static struct platform_driver snvs_lpgpr_driver = {
.probe = snvs_lpgpr_probe,
- .remove = snvs_lpgpr_remove,
.driver = {
.name = "snvs_lpgpr",
.of_match_table = snvs_lpgpr_dt_ids,
--
2.14.3
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [PATCH 07/20] nvmem: rockchip-efuse: Convert to use devm_nvmem_register()
2017-12-27 22:59 [PATCH 00/20] Verbatim device names and devm_nvmem_(un)register() Andrey Smirnov
` (5 preceding siblings ...)
2017-12-27 22:59 ` [PATCH 06/20] nvmem: snvs_lgpr: " Andrey Smirnov
@ 2017-12-27 22:59 ` Andrey Smirnov
2017-12-27 22:59 ` [PATCH 08/20] nvmem: qfprom: " Andrey Smirnov
` (12 subsequent siblings)
19 siblings, 0 replies; 22+ messages in thread
From: Andrey Smirnov @ 2017-12-27 22:59 UTC (permalink / raw)
To: linux-arm-kernel
Drop all of the code related to .remove hook and make use of
devm_nvmem_register() instead.
Cc: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Cc: Heiko Stuebner <heiko@sntech.de>
Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
Cc: Carlo Caione <carlo@caione.org>
Cc: Kevin Hilman <khilman@baylibre.com>
Cc: Matthias Brugger <matthias.bgg@gmail.com>
Cc: Joachim Eastwood <manabian@gmail.com>
Cc: cphealy at gmail.com
Cc: linux-kernel at vger.kernel.org
Cc: linux-mediatek at lists.infradead.org
Cc: linux-rockchip at lists.infradead.org
Cc: linux-amlogic at lists.infradead.org
Cc: linux-arm-kernel at lists.infradead.org
Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
---
drivers/nvmem/rockchip-efuse.c | 12 +-----------
1 file changed, 1 insertion(+), 11 deletions(-)
diff --git a/drivers/nvmem/rockchip-efuse.c b/drivers/nvmem/rockchip-efuse.c
index 123de77ca5d6..d6dc1330f895 100644
--- a/drivers/nvmem/rockchip-efuse.c
+++ b/drivers/nvmem/rockchip-efuse.c
@@ -221,25 +221,15 @@ static int rockchip_efuse_probe(struct platform_device *pdev)
econfig.reg_read = match->data;
econfig.priv = efuse;
econfig.dev = efuse->dev;
- nvmem = nvmem_register(&econfig);
+ nvmem = devm_nvmem_register(dev, &econfig);
if (IS_ERR(nvmem))
return PTR_ERR(nvmem);
- platform_set_drvdata(pdev, nvmem);
-
return 0;
}
-static int rockchip_efuse_remove(struct platform_device *pdev)
-{
- struct nvmem_device *nvmem = platform_get_drvdata(pdev);
-
- return nvmem_unregister(nvmem);
-}
-
static struct platform_driver rockchip_efuse_driver = {
.probe = rockchip_efuse_probe,
- .remove = rockchip_efuse_remove,
.driver = {
.name = "rockchip-efuse",
.of_match_table = rockchip_efuse_match,
--
2.14.3
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [PATCH 08/20] nvmem: qfprom: Convert to use devm_nvmem_register()
2017-12-27 22:59 [PATCH 00/20] Verbatim device names and devm_nvmem_(un)register() Andrey Smirnov
` (6 preceding siblings ...)
2017-12-27 22:59 ` [PATCH 07/20] nvmem: rockchip-efuse: " Andrey Smirnov
@ 2017-12-27 22:59 ` Andrey Smirnov
2017-12-27 22:59 ` [PATCH 09/20] nvmem: mtk-efuse: " Andrey Smirnov
` (11 subsequent siblings)
19 siblings, 0 replies; 22+ messages in thread
From: Andrey Smirnov @ 2017-12-27 22:59 UTC (permalink / raw)
To: linux-arm-kernel
Drop all of the code related to .remove hook and make use of
devm_nvmem_register() instead.
Cc: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Cc: Heiko Stuebner <heiko@sntech.de>
Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
Cc: Carlo Caione <carlo@caione.org>
Cc: Kevin Hilman <khilman@baylibre.com>
Cc: Matthias Brugger <matthias.bgg@gmail.com>
Cc: Joachim Eastwood <manabian@gmail.com>
Cc: cphealy at gmail.com
Cc: linux-kernel at vger.kernel.org
Cc: linux-mediatek at lists.infradead.org
Cc: linux-rockchip at lists.infradead.org
Cc: linux-amlogic at lists.infradead.org
Cc: linux-arm-kernel at lists.infradead.org
Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
---
drivers/nvmem/qfprom.c | 12 +-----------
1 file changed, 1 insertion(+), 11 deletions(-)
diff --git a/drivers/nvmem/qfprom.c b/drivers/nvmem/qfprom.c
index cb3b48b47d64..13bf43c84bd4 100644
--- a/drivers/nvmem/qfprom.c
+++ b/drivers/nvmem/qfprom.c
@@ -47,13 +47,6 @@ static int qfprom_reg_write(void *context,
return 0;
}
-static int qfprom_remove(struct platform_device *pdev)
-{
- struct nvmem_device *nvmem = platform_get_drvdata(pdev);
-
- return nvmem_unregister(nvmem);
-}
-
static struct nvmem_config econfig = {
.name = "qfprom",
.stride = 1,
@@ -82,12 +75,10 @@ static int qfprom_probe(struct platform_device *pdev)
econfig.dev = dev;
econfig.priv = priv;
- nvmem = nvmem_register(&econfig);
+ nvmem = devm_nvmem_register(dev, &econfig);
if (IS_ERR(nvmem))
return PTR_ERR(nvmem);
- platform_set_drvdata(pdev, nvmem);
-
return 0;
}
@@ -99,7 +90,6 @@ MODULE_DEVICE_TABLE(of, qfprom_of_match);
static struct platform_driver qfprom_driver = {
.probe = qfprom_probe,
- .remove = qfprom_remove,
.driver = {
.name = "qcom,qfprom",
.of_match_table = qfprom_of_match,
--
2.14.3
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [PATCH 09/20] nvmem: mtk-efuse: Convert to use devm_nvmem_register()
2017-12-27 22:59 [PATCH 00/20] Verbatim device names and devm_nvmem_(un)register() Andrey Smirnov
` (7 preceding siblings ...)
2017-12-27 22:59 ` [PATCH 08/20] nvmem: qfprom: " Andrey Smirnov
@ 2017-12-27 22:59 ` Andrey Smirnov
2017-12-27 22:59 ` [PATCH 10/20] nvmem: meson-mx-efuse: " Andrey Smirnov
` (10 subsequent siblings)
19 siblings, 0 replies; 22+ messages in thread
From: Andrey Smirnov @ 2017-12-27 22:59 UTC (permalink / raw)
To: linux-arm-kernel
Drop all of the code related to .remove hook and make use of
devm_nvmem_register() instead.
Cc: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Cc: Heiko Stuebner <heiko@sntech.de>
Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
Cc: Carlo Caione <carlo@caione.org>
Cc: Kevin Hilman <khilman@baylibre.com>
Cc: Matthias Brugger <matthias.bgg@gmail.com>
Cc: Joachim Eastwood <manabian@gmail.com>
Cc: cphealy at gmail.com
Cc: linux-kernel at vger.kernel.org
Cc: linux-mediatek at lists.infradead.org
Cc: linux-rockchip at lists.infradead.org
Cc: linux-amlogic at lists.infradead.org
Cc: linux-arm-kernel at lists.infradead.org
Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
---
drivers/nvmem/mtk-efuse.c | 12 +-----------
1 file changed, 1 insertion(+), 11 deletions(-)
diff --git a/drivers/nvmem/mtk-efuse.c b/drivers/nvmem/mtk-efuse.c
index 9ee3479cfc7b..97ab7e6a4789 100644
--- a/drivers/nvmem/mtk-efuse.c
+++ b/drivers/nvmem/mtk-efuse.c
@@ -72,22 +72,13 @@ static int mtk_efuse_probe(struct platform_device *pdev)
econfig.size = resource_size(res);
econfig.priv = priv;
econfig.dev = dev;
- nvmem = nvmem_register(&econfig);
+ nvmem = devm_nvmem_register(dev, &econfig);
if (IS_ERR(nvmem))
return PTR_ERR(nvmem);
- platform_set_drvdata(pdev, nvmem);
-
return 0;
}
-static int mtk_efuse_remove(struct platform_device *pdev)
-{
- struct nvmem_device *nvmem = platform_get_drvdata(pdev);
-
- return nvmem_unregister(nvmem);
-}
-
static const struct of_device_id mtk_efuse_of_match[] = {
{ .compatible = "mediatek,mt8173-efuse",},
{ .compatible = "mediatek,efuse",},
@@ -97,7 +88,6 @@ MODULE_DEVICE_TABLE(of, mtk_efuse_of_match);
static struct platform_driver mtk_efuse_driver = {
.probe = mtk_efuse_probe,
- .remove = mtk_efuse_remove,
.driver = {
.name = "mediatek,efuse",
.of_match_table = mtk_efuse_of_match,
--
2.14.3
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [PATCH 10/20] nvmem: meson-mx-efuse: Convert to use devm_nvmem_register()
2017-12-27 22:59 [PATCH 00/20] Verbatim device names and devm_nvmem_(un)register() Andrey Smirnov
` (8 preceding siblings ...)
2017-12-27 22:59 ` [PATCH 09/20] nvmem: mtk-efuse: " Andrey Smirnov
@ 2017-12-27 22:59 ` Andrey Smirnov
2017-12-27 22:59 ` [PATCH 11/20] nvmem: meson-efuse: " Andrey Smirnov
` (9 subsequent siblings)
19 siblings, 0 replies; 22+ messages in thread
From: Andrey Smirnov @ 2017-12-27 22:59 UTC (permalink / raw)
To: linux-arm-kernel
Drop all of the code related to .remove hook and make use of
devm_nvmem_register() instead.
Cc: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Cc: Heiko Stuebner <heiko@sntech.de>
Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
Cc: Carlo Caione <carlo@caione.org>
Cc: Kevin Hilman <khilman@baylibre.com>
Cc: Matthias Brugger <matthias.bgg@gmail.com>
Cc: Joachim Eastwood <manabian@gmail.com>
Cc: cphealy at gmail.com
Cc: linux-kernel at vger.kernel.org
Cc: linux-mediatek at lists.infradead.org
Cc: linux-rockchip at lists.infradead.org
Cc: linux-amlogic at lists.infradead.org
Cc: linux-arm-kernel at lists.infradead.org
Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
---
drivers/nvmem/meson-mx-efuse.c | 12 +-----------
1 file changed, 1 insertion(+), 11 deletions(-)
diff --git a/drivers/nvmem/meson-mx-efuse.c b/drivers/nvmem/meson-mx-efuse.c
index a346b4923550..f8e0b92e40ba 100644
--- a/drivers/nvmem/meson-mx-efuse.c
+++ b/drivers/nvmem/meson-mx-efuse.c
@@ -233,25 +233,15 @@ static int meson_mx_efuse_probe(struct platform_device *pdev)
return PTR_ERR(efuse->core_clk);
}
- efuse->nvmem = nvmem_register(&efuse->config);
+ efuse->nvmem = devm_nvmem_register(&pdev->dev, &efuse->config);
if (IS_ERR(efuse->nvmem))
return PTR_ERR(efuse->nvmem);
- platform_set_drvdata(pdev, efuse);
-
return 0;
}
-static int meson_mx_efuse_remove(struct platform_device *pdev)
-{
- struct meson_mx_efuse *efuse = platform_get_drvdata(pdev);
-
- return nvmem_unregister(efuse->nvmem);
-}
-
static struct platform_driver meson_mx_efuse_driver = {
.probe = meson_mx_efuse_probe,
- .remove = meson_mx_efuse_remove,
.driver = {
.name = "meson-mx-efuse",
.of_match_table = meson_mx_efuse_match,
--
2.14.3
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [PATCH 11/20] nvmem: meson-efuse: Convert to use devm_nvmem_register()
2017-12-27 22:59 [PATCH 00/20] Verbatim device names and devm_nvmem_(un)register() Andrey Smirnov
` (9 preceding siblings ...)
2017-12-27 22:59 ` [PATCH 10/20] nvmem: meson-mx-efuse: " Andrey Smirnov
@ 2017-12-27 22:59 ` Andrey Smirnov
2017-12-30 6:38 ` kbuild test robot
2017-12-27 22:59 ` [PATCH 12/20] nvmem: lpc18xx_otp: " Andrey Smirnov
` (8 subsequent siblings)
19 siblings, 1 reply; 22+ messages in thread
From: Andrey Smirnov @ 2017-12-27 22:59 UTC (permalink / raw)
To: linux-arm-kernel
Drop all of the code related to .remove hook and make use of
devm_nvmem_register() instead.
Cc: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Cc: Heiko Stuebner <heiko@sntech.de>
Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
Cc: Carlo Caione <carlo@caione.org>
Cc: Kevin Hilman <khilman@baylibre.com>
Cc: Matthias Brugger <matthias.bgg@gmail.com>
Cc: Joachim Eastwood <manabian@gmail.com>
Cc: cphealy at gmail.com
Cc: linux-kernel at vger.kernel.org
Cc: linux-mediatek at lists.infradead.org
Cc: linux-rockchip at lists.infradead.org
Cc: linux-amlogic at lists.infradead.org
Cc: linux-arm-kernel at lists.infradead.org
Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
---
drivers/nvmem/meson-efuse.c | 11 +----------
1 file changed, 1 insertion(+), 10 deletions(-)
diff --git a/drivers/nvmem/meson-efuse.c b/drivers/nvmem/meson-efuse.c
index a43c68f90937..02ec2873e583 100644
--- a/drivers/nvmem/meson-efuse.c
+++ b/drivers/nvmem/meson-efuse.c
@@ -60,22 +60,13 @@ static int meson_efuse_probe(struct platform_device *pdev)
econfig.reg_read = meson_efuse_read;
econfig.size = size;
- nvmem = nvmem_register(&econfig);
+ nvmem = devm_nvmem_register(&pdev->dev, &econfig);
if (IS_ERR(nvmem))
return PTR_ERR(nvmem);
- platform_set_drvdata(pdev, nvmem);
-
return 0;
}
-static int meson_efuse_remove(struct platform_device *pdev)
-{
- struct nvmem_device *nvmem = platform_get_drvdata(pdev);
-
- return nvmem_unregister(nvmem);
-}
-
static struct platform_driver meson_efuse_driver = {
.probe = meson_efuse_probe,
.remove = meson_efuse_remove,
--
2.14.3
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [PATCH 12/20] nvmem: lpc18xx_otp: Convert to use devm_nvmem_register()
2017-12-27 22:59 [PATCH 00/20] Verbatim device names and devm_nvmem_(un)register() Andrey Smirnov
` (10 preceding siblings ...)
2017-12-27 22:59 ` [PATCH 11/20] nvmem: meson-efuse: " Andrey Smirnov
@ 2017-12-27 22:59 ` Andrey Smirnov
2017-12-27 22:59 ` [PATCH 13/20] nvmem: imx-iim: " Andrey Smirnov
` (7 subsequent siblings)
19 siblings, 0 replies; 22+ messages in thread
From: Andrey Smirnov @ 2017-12-27 22:59 UTC (permalink / raw)
To: linux-arm-kernel
Drop all of the code related to .remove hook and make use of
devm_nvmem_register() instead.
Cc: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Cc: Heiko Stuebner <heiko@sntech.de>
Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
Cc: Carlo Caione <carlo@caione.org>
Cc: Kevin Hilman <khilman@baylibre.com>
Cc: Matthias Brugger <matthias.bgg@gmail.com>
Cc: Joachim Eastwood <manabian@gmail.com>
Cc: cphealy at gmail.com
Cc: linux-kernel at vger.kernel.org
Cc: linux-mediatek at lists.infradead.org
Cc: linux-rockchip at lists.infradead.org
Cc: linux-amlogic at lists.infradead.org
Cc: linux-arm-kernel at lists.infradead.org
Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
---
drivers/nvmem/lpc18xx_otp.c | 12 +-----------
1 file changed, 1 insertion(+), 11 deletions(-)
diff --git a/drivers/nvmem/lpc18xx_otp.c b/drivers/nvmem/lpc18xx_otp.c
index 95268db155e9..74777bfe2dcd 100644
--- a/drivers/nvmem/lpc18xx_otp.c
+++ b/drivers/nvmem/lpc18xx_otp.c
@@ -86,22 +86,13 @@ static int lpc18xx_otp_probe(struct platform_device *pdev)
lpc18xx_otp_nvmem_config.dev = &pdev->dev;
lpc18xx_otp_nvmem_config.priv = otp;
- nvmem = nvmem_register(&lpc18xx_otp_nvmem_config);
+ nvmem = devm_nvmem_register(&pdev->dev, &lpc18xx_otp_nvmem_config);
if (IS_ERR(nvmem))
return PTR_ERR(nvmem);
- platform_set_drvdata(pdev, nvmem);
-
return 0;
}
-static int lpc18xx_otp_remove(struct platform_device *pdev)
-{
- struct nvmem_device *nvmem = platform_get_drvdata(pdev);
-
- return nvmem_unregister(nvmem);
-}
-
static const struct of_device_id lpc18xx_otp_dt_ids[] = {
{ .compatible = "nxp,lpc1850-otp" },
{ },
@@ -110,7 +101,6 @@ MODULE_DEVICE_TABLE(of, lpc18xx_otp_dt_ids);
static struct platform_driver lpc18xx_otp_driver = {
.probe = lpc18xx_otp_probe,
- .remove = lpc18xx_otp_remove,
.driver = {
.name = "lpc18xx_otp",
.of_match_table = lpc18xx_otp_dt_ids,
--
2.14.3
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [PATCH 13/20] nvmem: imx-iim: Convert to use devm_nvmem_register()
2017-12-27 22:59 [PATCH 00/20] Verbatim device names and devm_nvmem_(un)register() Andrey Smirnov
` (11 preceding siblings ...)
2017-12-27 22:59 ` [PATCH 12/20] nvmem: lpc18xx_otp: " Andrey Smirnov
@ 2017-12-27 22:59 ` Andrey Smirnov
2017-12-27 22:59 ` [PATCH 14/20] nvmem: bcm-ocotp: " Andrey Smirnov
` (6 subsequent siblings)
19 siblings, 0 replies; 22+ messages in thread
From: Andrey Smirnov @ 2017-12-27 22:59 UTC (permalink / raw)
To: linux-arm-kernel
Drop all of the code related to .remove hook and make use of
devm_nvmem_register() instead.
Cc: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Cc: Heiko Stuebner <heiko@sntech.de>
Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
Cc: Carlo Caione <carlo@caione.org>
Cc: Kevin Hilman <khilman@baylibre.com>
Cc: Matthias Brugger <matthias.bgg@gmail.com>
Cc: Joachim Eastwood <manabian@gmail.com>
Cc: cphealy at gmail.com
Cc: linux-kernel at vger.kernel.org
Cc: linux-mediatek at lists.infradead.org
Cc: linux-rockchip at lists.infradead.org
Cc: linux-amlogic at lists.infradead.org
Cc: linux-arm-kernel at lists.infradead.org
Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
---
drivers/nvmem/imx-iim.c | 12 +-----------
1 file changed, 1 insertion(+), 11 deletions(-)
diff --git a/drivers/nvmem/imx-iim.c b/drivers/nvmem/imx-iim.c
index 52cfe91d9762..635561a441bd 100644
--- a/drivers/nvmem/imx-iim.c
+++ b/drivers/nvmem/imx-iim.c
@@ -138,25 +138,15 @@ static int imx_iim_probe(struct platform_device *pdev)
cfg.size = drvdata->nregs;
cfg.priv = iim;
- nvmem = nvmem_register(&cfg);
+ nvmem = devm_nvmem_register(dev, &cfg);
if (IS_ERR(nvmem))
return PTR_ERR(nvmem);
- platform_set_drvdata(pdev, nvmem);
-
return 0;
}
-static int imx_iim_remove(struct platform_device *pdev)
-{
- struct nvmem_device *nvmem = platform_get_drvdata(pdev);
-
- return nvmem_unregister(nvmem);
-}
-
static struct platform_driver imx_iim_driver = {
.probe = imx_iim_probe,
- .remove = imx_iim_remove,
.driver = {
.name = "imx-iim",
.of_match_table = imx_iim_dt_ids,
--
2.14.3
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [PATCH 14/20] nvmem: bcm-ocotp: Convert to use devm_nvmem_register()
2017-12-27 22:59 [PATCH 00/20] Verbatim device names and devm_nvmem_(un)register() Andrey Smirnov
` (12 preceding siblings ...)
2017-12-27 22:59 ` [PATCH 13/20] nvmem: imx-iim: " Andrey Smirnov
@ 2017-12-27 22:59 ` Andrey Smirnov
2017-12-27 22:59 ` [PATCH 15/20] nvmem: snvs_lpgpr: Convert commas to semicolons Andrey Smirnov
` (5 subsequent siblings)
19 siblings, 0 replies; 22+ messages in thread
From: Andrey Smirnov @ 2017-12-27 22:59 UTC (permalink / raw)
To: linux-arm-kernel
Drop all of the code related to .remove hook and make use of
devm_nvmem_register() instead.
Cc: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Cc: Heiko Stuebner <heiko@sntech.de>
Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
Cc: Carlo Caione <carlo@caione.org>
Cc: Kevin Hilman <khilman@baylibre.com>
Cc: Matthias Brugger <matthias.bgg@gmail.com>
Cc: Joachim Eastwood <manabian@gmail.com>
Cc: cphealy at gmail.com
Cc: linux-kernel at vger.kernel.org
Cc: linux-mediatek at lists.infradead.org
Cc: linux-rockchip at lists.infradead.org
Cc: linux-amlogic at lists.infradead.org
Cc: linux-arm-kernel at lists.infradead.org
Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
---
drivers/nvmem/bcm-ocotp.c | 12 +-----------
1 file changed, 1 insertion(+), 11 deletions(-)
diff --git a/drivers/nvmem/bcm-ocotp.c b/drivers/nvmem/bcm-ocotp.c
index 5e9e324427f9..24c30fa475cc 100644
--- a/drivers/nvmem/bcm-ocotp.c
+++ b/drivers/nvmem/bcm-ocotp.c
@@ -302,27 +302,17 @@ static int bcm_otpc_probe(struct platform_device *pdev)
priv->config = &bcm_otpc_nvmem_config;
- nvmem = nvmem_register(&bcm_otpc_nvmem_config);
+ nvmem = devm_nvmem_register(dev, &bcm_otpc_nvmem_config);
if (IS_ERR(nvmem)) {
dev_err(dev, "error registering nvmem config\n");
return PTR_ERR(nvmem);
}
- platform_set_drvdata(pdev, nvmem);
-
return 0;
}
-static int bcm_otpc_remove(struct platform_device *pdev)
-{
- struct nvmem_device *nvmem = platform_get_drvdata(pdev);
-
- return nvmem_unregister(nvmem);
-}
-
static struct platform_driver bcm_otpc_driver = {
.probe = bcm_otpc_probe,
- .remove = bcm_otpc_remove,
.driver = {
.name = "brcm-otpc",
.of_match_table = bcm_otpc_dt_ids,
--
2.14.3
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [PATCH 15/20] nvmem: snvs_lpgpr: Convert commas to semicolons
2017-12-27 22:59 [PATCH 00/20] Verbatim device names and devm_nvmem_(un)register() Andrey Smirnov
` (13 preceding siblings ...)
2017-12-27 22:59 ` [PATCH 14/20] nvmem: bcm-ocotp: " Andrey Smirnov
@ 2017-12-27 22:59 ` Andrey Smirnov
2017-12-27 22:59 ` [PATCH 16/20] nvmem: rockchip-efuse: Make use of of_device_get_match_data() Andrey Smirnov
` (4 subsequent siblings)
19 siblings, 0 replies; 22+ messages in thread
From: Andrey Smirnov @ 2017-12-27 22:59 UTC (permalink / raw)
To: linux-arm-kernel
Looks like commas were accidentally used where semicolons were
supposed to be. Fix that.
Cc: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Cc: Heiko Stuebner <heiko@sntech.de>
Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
Cc: Carlo Caione <carlo@caione.org>
Cc: Kevin Hilman <khilman@baylibre.com>
Cc: Matthias Brugger <matthias.bgg@gmail.com>
Cc: Joachim Eastwood <manabian@gmail.com>
Cc: cphealy at gmail.com
Cc: linux-kernel at vger.kernel.org
Cc: linux-mediatek at lists.infradead.org
Cc: linux-rockchip at lists.infradead.org
Cc: linux-amlogic at lists.infradead.org
Cc: linux-arm-kernel at lists.infradead.org
Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
---
drivers/nvmem/snvs_lpgpr.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/nvmem/snvs_lpgpr.c b/drivers/nvmem/snvs_lpgpr.c
index 6a2fdd09e74a..90aaf818563b 100644
--- a/drivers/nvmem/snvs_lpgpr.c
+++ b/drivers/nvmem/snvs_lpgpr.c
@@ -110,12 +110,12 @@ static int snvs_lpgpr_probe(struct platform_device *pdev)
cfg->priv = priv;
cfg->name = dev_name(dev);
cfg->dev = dev;
- cfg->stride = 4,
- cfg->word_size = 4,
- cfg->size = 4,
- cfg->owner = THIS_MODULE,
- cfg->reg_read = snvs_lpgpr_read,
- cfg->reg_write = snvs_lpgpr_write,
+ cfg->stride = 4;
+ cfg->word_size = 4;
+ cfg->size = 4;
+ cfg->owner = THIS_MODULE;
+ cfg->reg_read = snvs_lpgpr_read;
+ cfg->reg_write = snvs_lpgpr_write;
nvmem = devm_nvmem_register(dev, cfg);
if (IS_ERR(nvmem))
--
2.14.3
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [PATCH 16/20] nvmem: rockchip-efuse: Make use of of_device_get_match_data()
2017-12-27 22:59 [PATCH 00/20] Verbatim device names and devm_nvmem_(un)register() Andrey Smirnov
` (14 preceding siblings ...)
2017-12-27 22:59 ` [PATCH 15/20] nvmem: snvs_lpgpr: Convert commas to semicolons Andrey Smirnov
@ 2017-12-27 22:59 ` Andrey Smirnov
2017-12-27 22:59 ` [PATCH 17/20] nvmem: vf610-ocotp: Do not use "&pdev->dev" explicitly Andrey Smirnov
` (3 subsequent siblings)
19 siblings, 0 replies; 22+ messages in thread
From: Andrey Smirnov @ 2017-12-27 22:59 UTC (permalink / raw)
To: linux-arm-kernel
Simplify code a bit by using of_device_get_match_data() instead of
of_match_device().
Cc: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Cc: Heiko Stuebner <heiko@sntech.de>
Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
Cc: Carlo Caione <carlo@caione.org>
Cc: Kevin Hilman <khilman@baylibre.com>
Cc: Matthias Brugger <matthias.bgg@gmail.com>
Cc: Joachim Eastwood <manabian@gmail.com>
Cc: cphealy at gmail.com
Cc: linux-kernel at vger.kernel.org
Cc: linux-mediatek at lists.infradead.org
Cc: linux-rockchip at lists.infradead.org
Cc: linux-amlogic at lists.infradead.org
Cc: linux-arm-kernel at lists.infradead.org
Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
---
drivers/nvmem/rockchip-efuse.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/nvmem/rockchip-efuse.c b/drivers/nvmem/rockchip-efuse.c
index d6dc1330f895..979ba0a376a0 100644
--- a/drivers/nvmem/rockchip-efuse.c
+++ b/drivers/nvmem/rockchip-efuse.c
@@ -193,11 +193,11 @@ static int rockchip_efuse_probe(struct platform_device *pdev)
struct resource *res;
struct nvmem_device *nvmem;
struct rockchip_efuse_chip *efuse;
- const struct of_device_id *match;
+ const void *data;
struct device *dev = &pdev->dev;
- match = of_match_device(dev->driver->of_match_table, dev);
- if (!match || !match->data) {
+ data = of_device_get_match_data(dev);
+ if (!data) {
dev_err(dev, "failed to get match data\n");
return -EINVAL;
}
@@ -218,7 +218,7 @@ static int rockchip_efuse_probe(struct platform_device *pdev)
efuse->dev = &pdev->dev;
econfig.size = resource_size(res);
- econfig.reg_read = match->data;
+ econfig.reg_read = data;
econfig.priv = efuse;
econfig.dev = efuse->dev;
nvmem = devm_nvmem_register(dev, &econfig);
--
2.14.3
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [PATCH 17/20] nvmem: vf610-ocotp: Do not use "&pdev->dev" explicitly
2017-12-27 22:59 [PATCH 00/20] Verbatim device names and devm_nvmem_(un)register() Andrey Smirnov
` (15 preceding siblings ...)
2017-12-27 22:59 ` [PATCH 16/20] nvmem: rockchip-efuse: Make use of of_device_get_match_data() Andrey Smirnov
@ 2017-12-27 22:59 ` Andrey Smirnov
2017-12-27 22:59 ` [PATCH 18/20] nvmem: rockchip-efuse: " Andrey Smirnov
` (2 subsequent siblings)
19 siblings, 0 replies; 22+ messages in thread
From: Andrey Smirnov @ 2017-12-27 22:59 UTC (permalink / raw)
To: linux-arm-kernel
There already a "dev" variable for that. Use it.
Cc: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Cc: Heiko Stuebner <heiko@sntech.de>
Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
Cc: Carlo Caione <carlo@caione.org>
Cc: Kevin Hilman <khilman@baylibre.com>
Cc: Matthias Brugger <matthias.bgg@gmail.com>
Cc: Joachim Eastwood <manabian@gmail.com>
Cc: cphealy at gmail.com
Cc: linux-kernel at vger.kernel.org
Cc: linux-mediatek at lists.infradead.org
Cc: linux-rockchip at lists.infradead.org
Cc: linux-amlogic at lists.infradead.org
Cc: linux-arm-kernel at lists.infradead.org
Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
---
drivers/nvmem/vf610-ocotp.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/nvmem/vf610-ocotp.c b/drivers/nvmem/vf610-ocotp.c
index 752a0983e7fb..6e6bf7987d9d 100644
--- a/drivers/nvmem/vf610-ocotp.c
+++ b/drivers/nvmem/vf610-ocotp.c
@@ -223,8 +223,7 @@ static int vf610_ocotp_probe(struct platform_device *pdev)
struct resource *res;
struct vf610_ocotp *ocotp_dev;
- ocotp_dev = devm_kzalloc(&pdev->dev,
- sizeof(struct vf610_ocotp), GFP_KERNEL);
+ ocotp_dev = devm_kzalloc(dev, sizeof(struct vf610_ocotp), GFP_KERNEL);
if (!ocotp_dev)
return -ENOMEM;
--
2.14.3
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [PATCH 18/20] nvmem: rockchip-efuse: Do not use "&pdev->dev" explicitly
2017-12-27 22:59 [PATCH 00/20] Verbatim device names and devm_nvmem_(un)register() Andrey Smirnov
` (16 preceding siblings ...)
2017-12-27 22:59 ` [PATCH 17/20] nvmem: vf610-ocotp: Do not use "&pdev->dev" explicitly Andrey Smirnov
@ 2017-12-27 22:59 ` Andrey Smirnov
2017-12-27 22:59 ` [PATCH 19/20] nvmem: imx-iim: " Andrey Smirnov
2017-12-27 22:59 ` [PATCH 20/20] nvmem: bcm-ocotp: " Andrey Smirnov
19 siblings, 0 replies; 22+ messages in thread
From: Andrey Smirnov @ 2017-12-27 22:59 UTC (permalink / raw)
To: linux-arm-kernel
There's "dev" variable for this already. Use it.
Cc: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Cc: Heiko Stuebner <heiko@sntech.de>
Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
Cc: Carlo Caione <carlo@caione.org>
Cc: Kevin Hilman <khilman@baylibre.com>
Cc: Matthias Brugger <matthias.bgg@gmail.com>
Cc: Joachim Eastwood <manabian@gmail.com>
Cc: cphealy at gmail.com
Cc: linux-kernel at vger.kernel.org
Cc: linux-mediatek at lists.infradead.org
Cc: linux-rockchip at lists.infradead.org
Cc: linux-amlogic at lists.infradead.org
Cc: linux-arm-kernel at lists.infradead.org
Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
---
drivers/nvmem/rockchip-efuse.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/nvmem/rockchip-efuse.c b/drivers/nvmem/rockchip-efuse.c
index 979ba0a376a0..3120329aea94 100644
--- a/drivers/nvmem/rockchip-efuse.c
+++ b/drivers/nvmem/rockchip-efuse.c
@@ -202,21 +202,21 @@ static int rockchip_efuse_probe(struct platform_device *pdev)
return -EINVAL;
}
- efuse = devm_kzalloc(&pdev->dev, sizeof(struct rockchip_efuse_chip),
+ efuse = devm_kzalloc(dev, sizeof(struct rockchip_efuse_chip),
GFP_KERNEL);
if (!efuse)
return -ENOMEM;
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
- efuse->base = devm_ioremap_resource(&pdev->dev, res);
+ efuse->base = devm_ioremap_resource(dev, res);
if (IS_ERR(efuse->base))
return PTR_ERR(efuse->base);
- efuse->clk = devm_clk_get(&pdev->dev, "pclk_efuse");
+ efuse->clk = devm_clk_get(dev, "pclk_efuse");
if (IS_ERR(efuse->clk))
return PTR_ERR(efuse->clk);
- efuse->dev = &pdev->dev;
+ efuse->dev = dev;
econfig.size = resource_size(res);
econfig.reg_read = data;
econfig.priv = efuse;
--
2.14.3
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [PATCH 19/20] nvmem: imx-iim: Do not use "&pdev->dev" explicitly
2017-12-27 22:59 [PATCH 00/20] Verbatim device names and devm_nvmem_(un)register() Andrey Smirnov
` (17 preceding siblings ...)
2017-12-27 22:59 ` [PATCH 18/20] nvmem: rockchip-efuse: " Andrey Smirnov
@ 2017-12-27 22:59 ` Andrey Smirnov
2017-12-27 22:59 ` [PATCH 20/20] nvmem: bcm-ocotp: " Andrey Smirnov
19 siblings, 0 replies; 22+ messages in thread
From: Andrey Smirnov @ 2017-12-27 22:59 UTC (permalink / raw)
To: linux-arm-kernel
There's already "dev" variable for that. Use it.
Cc: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Cc: Heiko Stuebner <heiko@sntech.de>
Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
Cc: Carlo Caione <carlo@caione.org>
Cc: Kevin Hilman <khilman@baylibre.com>
Cc: Matthias Brugger <matthias.bgg@gmail.com>
Cc: Joachim Eastwood <manabian@gmail.com>
Cc: cphealy at gmail.com
Cc: linux-kernel at vger.kernel.org
Cc: linux-mediatek at lists.infradead.org
Cc: linux-rockchip at lists.infradead.org
Cc: linux-amlogic at lists.infradead.org
Cc: linux-arm-kernel at lists.infradead.org
Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
---
drivers/nvmem/imx-iim.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/nvmem/imx-iim.c b/drivers/nvmem/imx-iim.c
index 635561a441bd..3022bd96bd7e 100644
--- a/drivers/nvmem/imx-iim.c
+++ b/drivers/nvmem/imx-iim.c
@@ -125,7 +125,7 @@ static int imx_iim_probe(struct platform_device *pdev)
drvdata = of_id->data;
- iim->clk = devm_clk_get(&pdev->dev, NULL);
+ iim->clk = devm_clk_get(dev, NULL);
if (IS_ERR(iim->clk))
return PTR_ERR(iim->clk);
--
2.14.3
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [PATCH 20/20] nvmem: bcm-ocotp: Do not use "&pdev->dev" explicitly
2017-12-27 22:59 [PATCH 00/20] Verbatim device names and devm_nvmem_(un)register() Andrey Smirnov
` (18 preceding siblings ...)
2017-12-27 22:59 ` [PATCH 19/20] nvmem: imx-iim: " Andrey Smirnov
@ 2017-12-27 22:59 ` Andrey Smirnov
19 siblings, 0 replies; 22+ messages in thread
From: Andrey Smirnov @ 2017-12-27 22:59 UTC (permalink / raw)
To: linux-arm-kernel
There's "dev" variable for this already. Use it.
Cc: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Cc: Heiko Stuebner <heiko@sntech.de>
Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
Cc: Carlo Caione <carlo@caione.org>
Cc: Kevin Hilman <khilman@baylibre.com>
Cc: Matthias Brugger <matthias.bgg@gmail.com>
Cc: Joachim Eastwood <manabian@gmail.com>
Cc: cphealy at gmail.com
Cc: linux-kernel at vger.kernel.org
Cc: linux-mediatek at lists.infradead.org
Cc: linux-rockchip at lists.infradead.org
Cc: linux-amlogic at lists.infradead.org
Cc: linux-arm-kernel at lists.infradead.org
Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
---
drivers/nvmem/bcm-ocotp.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/nvmem/bcm-ocotp.c b/drivers/nvmem/bcm-ocotp.c
index 24c30fa475cc..4159b3f41d79 100644
--- a/drivers/nvmem/bcm-ocotp.c
+++ b/drivers/nvmem/bcm-ocotp.c
@@ -262,8 +262,7 @@ static int bcm_otpc_probe(struct platform_device *pdev)
else if (of_device_is_compatible(dev->of_node, "brcm,ocotp-v2"))
priv->map = &otp_map_v2;
else {
- dev_err(&pdev->dev,
- "%s otpc config map not defined\n", __func__);
+ dev_err(dev, "%s otpc config map not defined\n", __func__);
return -EINVAL;
}
--
2.14.3
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [PATCH 11/20] nvmem: meson-efuse: Convert to use devm_nvmem_register()
2017-12-27 22:59 ` [PATCH 11/20] nvmem: meson-efuse: " Andrey Smirnov
@ 2017-12-30 6:38 ` kbuild test robot
0 siblings, 0 replies; 22+ messages in thread
From: kbuild test robot @ 2017-12-30 6:38 UTC (permalink / raw)
To: linux-arm-kernel
Hi Andrey,
Thank you for the patch! Yet something to improve:
[auto build test ERROR on linus/master]
[also build test ERROR on v4.15-rc5]
[cannot apply to next-20171222]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]
url: https://github.com/0day-ci/linux/commits/Andrey-Smirnov/Verbatim-device-names-and-devm_nvmem_-un-register/20171230-114930
config: arm64-allyesconfig (attached as .config)
compiler: aarch64-linux-gnu-gcc (Debian 7.2.0-11) 7.2.0
reproduce:
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# save the attached .config to linux build tree
make.cross ARCH=arm64
All errors (new ones prefixed by >>):
>> drivers/nvmem/meson-efuse.c:72:12: error: 'meson_efuse_remove' undeclared here (not in a function); did you mean 'meson_efuse_probe'?
.remove = meson_efuse_remove,
^~~~~~~~~~~~~~~~~~
meson_efuse_probe
vim +72 drivers/nvmem/meson-efuse.c
ad855eae Carlo Caione 2016-08-27 69
ad855eae Carlo Caione 2016-08-27 70 static struct platform_driver meson_efuse_driver = {
ad855eae Carlo Caione 2016-08-27 71 .probe = meson_efuse_probe,
ad855eae Carlo Caione 2016-08-27 @72 .remove = meson_efuse_remove,
ad855eae Carlo Caione 2016-08-27 73 .driver = {
ad855eae Carlo Caione 2016-08-27 74 .name = "meson-efuse",
ad855eae Carlo Caione 2016-08-27 75 .of_match_table = meson_efuse_match,
ad855eae Carlo Caione 2016-08-27 76 },
ad855eae Carlo Caione 2016-08-27 77 };
ad855eae Carlo Caione 2016-08-27 78
:::::: The code at line 72 was first introduced by commit
:::::: ad855eae6caf0d1dd17bce5bcd8e07759adc9903 nvmem: amlogic: Add Amlogic Meson EFUSE driver
:::::: TO: Carlo Caione <carlo@endlessm.com>
:::::: CC: Kevin Hilman <khilman@baylibre.com>
---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation
-------------- next part --------------
A non-text attachment was scrubbed...
Name: .config.gz
Type: application/gzip
Size: 58528 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20171230/927dbd78/attachment-0001.gz>
^ permalink raw reply [flat|nested] 22+ messages in thread
end of thread, other threads:[~2017-12-30 6:38 UTC | newest]
Thread overview: 22+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-12-27 22:59 [PATCH 00/20] Verbatim device names and devm_nvmem_(un)register() Andrey Smirnov
2017-12-27 22:59 ` [PATCH 01/20] nvmem: core: Allow specifying device name verbatim Andrey Smirnov
2017-12-27 22:59 ` [PATCH 02/20] nvmem: Introduce devm_nvmem_(un)register() Andrey Smirnov
2017-12-27 22:59 ` [PATCH 03/20] nvmem: vf610-ocotp: Convert to use devm_nvmem_register() Andrey Smirnov
2017-12-27 22:59 ` [PATCH 04/20] nvmem: imx-ocotp: " Andrey Smirnov
2017-12-27 22:59 ` [PATCH 05/20] nvmem: uniphier-efuse: " Andrey Smirnov
2017-12-27 22:59 ` [PATCH 06/20] nvmem: snvs_lgpr: " Andrey Smirnov
2017-12-27 22:59 ` [PATCH 07/20] nvmem: rockchip-efuse: " Andrey Smirnov
2017-12-27 22:59 ` [PATCH 08/20] nvmem: qfprom: " Andrey Smirnov
2017-12-27 22:59 ` [PATCH 09/20] nvmem: mtk-efuse: " Andrey Smirnov
2017-12-27 22:59 ` [PATCH 10/20] nvmem: meson-mx-efuse: " Andrey Smirnov
2017-12-27 22:59 ` [PATCH 11/20] nvmem: meson-efuse: " Andrey Smirnov
2017-12-30 6:38 ` kbuild test robot
2017-12-27 22:59 ` [PATCH 12/20] nvmem: lpc18xx_otp: " Andrey Smirnov
2017-12-27 22:59 ` [PATCH 13/20] nvmem: imx-iim: " Andrey Smirnov
2017-12-27 22:59 ` [PATCH 14/20] nvmem: bcm-ocotp: " Andrey Smirnov
2017-12-27 22:59 ` [PATCH 15/20] nvmem: snvs_lpgpr: Convert commas to semicolons Andrey Smirnov
2017-12-27 22:59 ` [PATCH 16/20] nvmem: rockchip-efuse: Make use of of_device_get_match_data() Andrey Smirnov
2017-12-27 22:59 ` [PATCH 17/20] nvmem: vf610-ocotp: Do not use "&pdev->dev" explicitly Andrey Smirnov
2017-12-27 22:59 ` [PATCH 18/20] nvmem: rockchip-efuse: " Andrey Smirnov
2017-12-27 22:59 ` [PATCH 19/20] nvmem: imx-iim: " Andrey Smirnov
2017-12-27 22:59 ` [PATCH 20/20] nvmem: bcm-ocotp: " Andrey Smirnov
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).