* [PATCH 2/8] nvmem: brcm_nvram: Use devm_platform_get_and_ioremap_resource()
2023-07-06 4:04 [PATCH 1/8] nvmem: sunxi_sid: Convert to devm_platform_ioremap_resource() Yangtao Li
@ 2023-07-06 4:04 ` Yangtao Li
2023-07-06 4:04 ` [PATCH 3/8] nvmem: lpc18xx_otp: Convert to devm_platform_ioremap_resource() Yangtao Li
` (7 subsequent siblings)
8 siblings, 0 replies; 11+ messages in thread
From: Yangtao Li @ 2023-07-06 4:04 UTC (permalink / raw)
To: Srinivas Kandagatla; +Cc: Yangtao Li, linux-kernel
Convert platform_get_resource(), devm_ioremap_resource() to a single
call to devm_platform_get_and_ioremap_resource(), as this is exactly
what this function does.
Signed-off-by: Yangtao Li <frank.li@vivo.com>
---
drivers/nvmem/brcm_nvram.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/nvmem/brcm_nvram.c b/drivers/nvmem/brcm_nvram.c
index 4567c597c87f..9737104f3b76 100644
--- a/drivers/nvmem/brcm_nvram.c
+++ b/drivers/nvmem/brcm_nvram.c
@@ -159,8 +159,7 @@ static int brcm_nvram_probe(struct platform_device *pdev)
return -ENOMEM;
priv->dev = dev;
- res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
- priv->base = devm_ioremap_resource(dev, res);
+ priv->base = devm_platform_get_and_ioremap_resource(pdev, 0, &res);
if (IS_ERR(priv->base))
return PTR_ERR(priv->base);
--
2.39.0
^ permalink raw reply related [flat|nested] 11+ messages in thread* [PATCH 3/8] nvmem: lpc18xx_otp: Convert to devm_platform_ioremap_resource()
2023-07-06 4:04 [PATCH 1/8] nvmem: sunxi_sid: Convert to devm_platform_ioremap_resource() Yangtao Li
2023-07-06 4:04 ` [PATCH 2/8] nvmem: brcm_nvram: Use devm_platform_get_and_ioremap_resource() Yangtao Li
@ 2023-07-06 4:04 ` Yangtao Li
2023-07-06 4:05 ` [PATCH 4/8] nvmem: meson-mx-efuse: " Yangtao Li
` (6 subsequent siblings)
8 siblings, 0 replies; 11+ messages in thread
From: Yangtao Li @ 2023-07-06 4:04 UTC (permalink / raw)
To: Srinivas Kandagatla, Vladimir Zapolskiy
Cc: Yangtao Li, linux-arm-kernel, linux-kernel
Use devm_platform_ioremap_resource() to simplify code.
Signed-off-by: Yangtao Li <frank.li@vivo.com>
---
drivers/nvmem/lpc18xx_otp.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/drivers/nvmem/lpc18xx_otp.c b/drivers/nvmem/lpc18xx_otp.c
index 16c92ea85d49..8faed05e3cbe 100644
--- a/drivers/nvmem/lpc18xx_otp.c
+++ b/drivers/nvmem/lpc18xx_otp.c
@@ -68,14 +68,12 @@ static int lpc18xx_otp_probe(struct platform_device *pdev)
{
struct nvmem_device *nvmem;
struct lpc18xx_otp *otp;
- struct resource *res;
otp = devm_kzalloc(&pdev->dev, sizeof(*otp), GFP_KERNEL);
if (!otp)
return -ENOMEM;
- res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
- otp->base = devm_ioremap_resource(&pdev->dev, res);
+ otp->base = devm_platform_ioremap_resource(pdev, 0);
if (IS_ERR(otp->base))
return PTR_ERR(otp->base);
--
2.39.0
^ permalink raw reply related [flat|nested] 11+ messages in thread* [PATCH 4/8] nvmem: meson-mx-efuse: Convert to devm_platform_ioremap_resource()
2023-07-06 4:04 [PATCH 1/8] nvmem: sunxi_sid: Convert to devm_platform_ioremap_resource() Yangtao Li
2023-07-06 4:04 ` [PATCH 2/8] nvmem: brcm_nvram: Use devm_platform_get_and_ioremap_resource() Yangtao Li
2023-07-06 4:04 ` [PATCH 3/8] nvmem: lpc18xx_otp: Convert to devm_platform_ioremap_resource() Yangtao Li
@ 2023-07-06 4:05 ` Yangtao Li
2023-07-06 4:05 ` [PATCH 5/8] nvmem: rockchip-efuse: Use devm_platform_get_and_ioremap_resource() Yangtao Li
` (5 subsequent siblings)
8 siblings, 0 replies; 11+ messages in thread
From: Yangtao Li @ 2023-07-06 4:05 UTC (permalink / raw)
To: Srinivas Kandagatla, Neil Armstrong, Kevin Hilman, Jerome Brunet,
Martin Blumenstingl
Cc: Yangtao Li, linux-arm-kernel, linux-amlogic, linux-kernel
Use devm_platform_ioremap_resource() to simplify code.
Signed-off-by: Yangtao Li <frank.li@vivo.com>
---
drivers/nvmem/meson-mx-efuse.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/drivers/nvmem/meson-mx-efuse.c b/drivers/nvmem/meson-mx-efuse.c
index 13eb14316f46..461e3ad87bcd 100644
--- a/drivers/nvmem/meson-mx-efuse.c
+++ b/drivers/nvmem/meson-mx-efuse.c
@@ -194,7 +194,6 @@ static int meson_mx_efuse_probe(struct platform_device *pdev)
{
const struct meson_mx_efuse_platform_data *drvdata;
struct meson_mx_efuse *efuse;
- struct resource *res;
drvdata = of_device_get_match_data(&pdev->dev);
if (!drvdata)
@@ -204,8 +203,7 @@ static int meson_mx_efuse_probe(struct platform_device *pdev)
if (!efuse)
return -ENOMEM;
- res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
- efuse->base = devm_ioremap_resource(&pdev->dev, res);
+ efuse->base = devm_platform_ioremap_resource(pdev, 0);
if (IS_ERR(efuse->base))
return PTR_ERR(efuse->base);
--
2.39.0
^ permalink raw reply related [flat|nested] 11+ messages in thread* [PATCH 5/8] nvmem: rockchip-efuse: Use devm_platform_get_and_ioremap_resource()
2023-07-06 4:04 [PATCH 1/8] nvmem: sunxi_sid: Convert to devm_platform_ioremap_resource() Yangtao Li
` (2 preceding siblings ...)
2023-07-06 4:05 ` [PATCH 4/8] nvmem: meson-mx-efuse: " Yangtao Li
@ 2023-07-06 4:05 ` Yangtao Li
2023-07-11 13:35 ` Heiko Stuebner
2023-07-06 4:05 ` [PATCH 6/8] nvmem: stm32-romem: " Yangtao Li
` (4 subsequent siblings)
8 siblings, 1 reply; 11+ messages in thread
From: Yangtao Li @ 2023-07-06 4:05 UTC (permalink / raw)
To: Srinivas Kandagatla, Heiko Stuebner
Cc: Yangtao Li, linux-arm-kernel, linux-rockchip, linux-kernel
Convert platform_get_resource(), devm_ioremap_resource() to a single
call to devm_platform_get_and_ioremap_resource(), as this is exactly
what this function does.
Signed-off-by: Yangtao Li <frank.li@vivo.com>
---
drivers/nvmem/rockchip-efuse.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/nvmem/rockchip-efuse.c b/drivers/nvmem/rockchip-efuse.c
index e4579de5d014..4004c5bece42 100644
--- a/drivers/nvmem/rockchip-efuse.c
+++ b/drivers/nvmem/rockchip-efuse.c
@@ -267,8 +267,7 @@ static int rockchip_efuse_probe(struct platform_device *pdev)
if (!efuse)
return -ENOMEM;
- res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
- efuse->base = devm_ioremap_resource(dev, res);
+ efuse->base = devm_platform_get_and_ioremap_resource(pdev, 0, &res);
if (IS_ERR(efuse->base))
return PTR_ERR(efuse->base);
--
2.39.0
^ permalink raw reply related [flat|nested] 11+ messages in thread* [PATCH 6/8] nvmem: stm32-romem: Use devm_platform_get_and_ioremap_resource()
2023-07-06 4:04 [PATCH 1/8] nvmem: sunxi_sid: Convert to devm_platform_ioremap_resource() Yangtao Li
` (3 preceding siblings ...)
2023-07-06 4:05 ` [PATCH 5/8] nvmem: rockchip-efuse: Use devm_platform_get_and_ioremap_resource() Yangtao Li
@ 2023-07-06 4:05 ` Yangtao Li
2023-07-06 4:05 ` [PATCH 7/8] nvmem: qfprom: do some cleanup Yangtao Li
` (3 subsequent siblings)
8 siblings, 0 replies; 11+ messages in thread
From: Yangtao Li @ 2023-07-06 4:05 UTC (permalink / raw)
To: Srinivas Kandagatla, Maxime Coquelin, Alexandre Torgue
Cc: Yangtao Li, linux-stm32, linux-arm-kernel, linux-kernel
Convert platform_get_resource(), devm_ioremap_resource() to a single
call to devm_platform_get_and_ioremap_resource(), as this is exactly
what this function does.
Signed-off-by: Yangtao Li <frank.li@vivo.com>
---
drivers/nvmem/stm32-romem.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/nvmem/stm32-romem.c b/drivers/nvmem/stm32-romem.c
index 38d0bf557129..0f84044bd1ad 100644
--- a/drivers/nvmem/stm32-romem.c
+++ b/drivers/nvmem/stm32-romem.c
@@ -196,8 +196,7 @@ static int stm32_romem_probe(struct platform_device *pdev)
if (!priv)
return -ENOMEM;
- res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
- priv->base = devm_ioremap_resource(dev, res);
+ priv->base = devm_platform_get_and_ioremap_resource(pdev, 0, &res);
if (IS_ERR(priv->base))
return PTR_ERR(priv->base);
--
2.39.0
^ permalink raw reply related [flat|nested] 11+ messages in thread* [PATCH 7/8] nvmem: qfprom: do some cleanup
2023-07-06 4:04 [PATCH 1/8] nvmem: sunxi_sid: Convert to devm_platform_ioremap_resource() Yangtao Li
` (4 preceding siblings ...)
2023-07-06 4:05 ` [PATCH 6/8] nvmem: stm32-romem: " Yangtao Li
@ 2023-07-06 4:05 ` Yangtao Li
2023-07-06 4:05 ` [PATCH 8/8] nvmem: uniphier: Use devm_platform_get_and_ioremap_resource() Yangtao Li
` (2 subsequent siblings)
8 siblings, 0 replies; 11+ messages in thread
From: Yangtao Li @ 2023-07-06 4:05 UTC (permalink / raw)
To: Srinivas Kandagatla; +Cc: Yangtao Li, linux-kernel
Use devm_platform_ioremap_resource() and
devm_platform_get_and_ioremap_resource() to simplify code.
BTW convert to use dev_err_probe() instead of open it.
Signed-off-by: Yangtao Li <frank.li@vivo.com>
---
drivers/nvmem/qfprom.c | 17 +++++------------
1 file changed, 5 insertions(+), 12 deletions(-)
diff --git a/drivers/nvmem/qfprom.c b/drivers/nvmem/qfprom.c
index c1e893c8a247..14814cba2dd6 100644
--- a/drivers/nvmem/qfprom.c
+++ b/drivers/nvmem/qfprom.c
@@ -374,8 +374,7 @@ static int qfprom_probe(struct platform_device *pdev)
return -ENOMEM;
/* The corrected section is always provided */
- res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
- priv->qfpcorrected = devm_ioremap_resource(dev, res);
+ priv->qfpcorrected = devm_platform_get_and_ioremap_resource(pdev, 0, &res);
if (IS_ERR(priv->qfpcorrected))
return PTR_ERR(priv->qfpcorrected);
@@ -402,12 +401,10 @@ static int qfprom_probe(struct platform_device *pdev)
priv->qfpraw = devm_ioremap_resource(dev, res);
if (IS_ERR(priv->qfpraw))
return PTR_ERR(priv->qfpraw);
- res = platform_get_resource(pdev, IORESOURCE_MEM, 2);
- priv->qfpconf = devm_ioremap_resource(dev, res);
+ priv->qfpconf = devm_platform_ioremap_resource(pdev, 2);
if (IS_ERR(priv->qfpconf))
return PTR_ERR(priv->qfpconf);
- res = platform_get_resource(pdev, IORESOURCE_MEM, 3);
- priv->qfpsecurity = devm_ioremap_resource(dev, res);
+ priv->qfpsecurity = devm_platform_ioremap_resource(pdev, 3);
if (IS_ERR(priv->qfpsecurity))
return PTR_ERR(priv->qfpsecurity);
@@ -427,12 +424,8 @@ static int qfprom_probe(struct platform_device *pdev)
return PTR_ERR(priv->vcc);
priv->secclk = devm_clk_get(dev, "core");
- if (IS_ERR(priv->secclk)) {
- ret = PTR_ERR(priv->secclk);
- if (ret != -EPROBE_DEFER)
- dev_err(dev, "Error getting clock: %d\n", ret);
- return ret;
- }
+ if (IS_ERR(priv->secclk))
+ return dev_err_probe(dev, PTR_ERR(priv->secclk), "Error getting clock\n");
/* Only enable writing if we have SoC data. */
if (priv->soc_data)
--
2.39.0
^ permalink raw reply related [flat|nested] 11+ messages in thread* [PATCH 8/8] nvmem: uniphier: Use devm_platform_get_and_ioremap_resource()
2023-07-06 4:04 [PATCH 1/8] nvmem: sunxi_sid: Convert to devm_platform_ioremap_resource() Yangtao Li
` (5 preceding siblings ...)
2023-07-06 4:05 ` [PATCH 7/8] nvmem: qfprom: do some cleanup Yangtao Li
@ 2023-07-06 4:05 ` Yangtao Li
2023-07-11 18:26 ` [PATCH 1/8] nvmem: sunxi_sid: Convert to devm_platform_ioremap_resource() Jernej Škrabec
2023-07-13 10:05 ` Srinivas Kandagatla
8 siblings, 0 replies; 11+ messages in thread
From: Yangtao Li @ 2023-07-06 4:05 UTC (permalink / raw)
To: Srinivas Kandagatla, Kunihiko Hayashi, Masami Hiramatsu
Cc: Yangtao Li, linux-arm-kernel, linux-kernel
Convert platform_get_resource(), devm_ioremap_resource() to a single
call to devm_platform_get_and_ioremap_resource(), as this is exactly
what this function does.
Signed-off-by: Yangtao Li <frank.li@vivo.com>
---
drivers/nvmem/uniphier-efuse.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/nvmem/uniphier-efuse.c b/drivers/nvmem/uniphier-efuse.c
index aca910b3b6f8..0a1dbb80537e 100644
--- a/drivers/nvmem/uniphier-efuse.c
+++ b/drivers/nvmem/uniphier-efuse.c
@@ -41,8 +41,7 @@ static int uniphier_efuse_probe(struct platform_device *pdev)
if (!priv)
return -ENOMEM;
- res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
- priv->base = devm_ioremap_resource(dev, res);
+ priv->base = devm_platform_get_and_ioremap_resource(pdev, 0, &res);
if (IS_ERR(priv->base))
return PTR_ERR(priv->base);
--
2.39.0
^ permalink raw reply related [flat|nested] 11+ messages in thread* Re: [PATCH 1/8] nvmem: sunxi_sid: Convert to devm_platform_ioremap_resource()
2023-07-06 4:04 [PATCH 1/8] nvmem: sunxi_sid: Convert to devm_platform_ioremap_resource() Yangtao Li
` (6 preceding siblings ...)
2023-07-06 4:05 ` [PATCH 8/8] nvmem: uniphier: Use devm_platform_get_and_ioremap_resource() Yangtao Li
@ 2023-07-11 18:26 ` Jernej Škrabec
2023-07-13 10:05 ` Srinivas Kandagatla
8 siblings, 0 replies; 11+ messages in thread
From: Jernej Škrabec @ 2023-07-11 18:26 UTC (permalink / raw)
To: Srinivas Kandagatla, Chen-Yu Tsai, Samuel Holland, Yangtao Li
Cc: Yangtao Li, linux-arm-kernel, linux-sunxi, linux-kernel
Dne četrtek, 06. julij 2023 ob 06:04:57 CEST je Yangtao Li napisal(a):
> Use devm_platform_ioremap_resource() to simplify code.
>
> Signed-off-by: Yangtao Li <frank.li@vivo.com>
Acked-by: Jernej Skrabec <jernej.skrabec@gmail.com>
Best regards,
Jernej
> ---
> drivers/nvmem/sunxi_sid.c | 4 +---
> 1 file changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/drivers/nvmem/sunxi_sid.c b/drivers/nvmem/sunxi_sid.c
> index a970f1741cc6..6bfe02ab169a 100644
> --- a/drivers/nvmem/sunxi_sid.c
> +++ b/drivers/nvmem/sunxi_sid.c
> @@ -125,7 +125,6 @@ static int sun8i_sid_read_by_reg(void *context, unsigned
> int offset, static int sunxi_sid_probe(struct platform_device *pdev)
> {
> struct device *dev = &pdev->dev;
> - struct resource *res;
> struct nvmem_config *nvmem_cfg;
> struct nvmem_device *nvmem;
> struct sunxi_sid *sid;
> @@ -142,8 +141,7 @@ static int sunxi_sid_probe(struct platform_device *pdev)
> return -EINVAL;
> sid->value_offset = cfg->value_offset;
>
> - res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> - sid->base = devm_ioremap_resource(dev, res);
> + sid->base = devm_platform_ioremap_resource(pdev, 0);
> if (IS_ERR(sid->base))
> return PTR_ERR(sid->base);
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [PATCH 1/8] nvmem: sunxi_sid: Convert to devm_platform_ioremap_resource()
2023-07-06 4:04 [PATCH 1/8] nvmem: sunxi_sid: Convert to devm_platform_ioremap_resource() Yangtao Li
` (7 preceding siblings ...)
2023-07-11 18:26 ` [PATCH 1/8] nvmem: sunxi_sid: Convert to devm_platform_ioremap_resource() Jernej Škrabec
@ 2023-07-13 10:05 ` Srinivas Kandagatla
8 siblings, 0 replies; 11+ messages in thread
From: Srinivas Kandagatla @ 2023-07-13 10:05 UTC (permalink / raw)
To: Chen-Yu Tsai, Jernej Skrabec, Samuel Holland, Yangtao Li
Cc: linux-arm-kernel, linux-sunxi, linux-kernel
On Thu, 06 Jul 2023 12:04:57 +0800, Yangtao Li wrote:
> Use devm_platform_ioremap_resource() to simplify code.
>
>
Applied, thanks!
[1/8] nvmem: sunxi_sid: Convert to devm_platform_ioremap_resource()
commit: e4ccbdc5f82463e014b6b9072f206f80326e61e9
[2/8] nvmem: brcm_nvram: Use devm_platform_get_and_ioremap_resource()
commit: 37bda099309f2c7c5a75113f43baf1ec3feeee14
[3/8] nvmem: lpc18xx_otp: Convert to devm_platform_ioremap_resource()
commit: 8584695d9ad95246e79d3470f97f16578eb3c2f0
[4/8] nvmem: meson-mx-efuse: Convert to devm_platform_ioremap_resource()
commit: b12a4928e60f0e683b1a8ccd317031de23a1679f
[5/8] nvmem: rockchip-efuse: Use devm_platform_get_and_ioremap_resource()
commit: c169b0d3f79a2c26cbb1233948ea374b7b7c8ec6
[6/8] nvmem: stm32-romem: Use devm_platform_get_and_ioremap_resource()
commit: 0d7713aa08dbd96d37f1fc33610b2cfcff87fed2
[7/8] nvmem: qfprom: do some cleanup
commit: 4156cae2936605e982ad671d1078d41edf79875b
[8/8] nvmem: uniphier: Use devm_platform_get_and_ioremap_resource()
commit: 17340c6c425fd0c29c75ee682742258955515a33
Best regards,
--
Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
^ permalink raw reply [flat|nested] 11+ messages in thread