All of lore.kernel.org
 help / color / mirror / Atom feed
From: Andrew Davis <afd@ti.com>
To: Sebastian Reichel <sre@kernel.org>,
	Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>,
	Cristian Ciocaltea <cristian.ciocaltea@gmail.com>,
	Florian Fainelli <florian.fainelli@broadcom.com>,
	Ray Jui <rjui@broadcom.com>,
	Scott Branden <sbranden@broadcom.com>,
	Bjorn Andersson <andersson@kernel.org>,
	Konrad Dybcio <konrad.dybcio@linaro.org>,
	Sean Wang <sean.wang@mediatek.com>,
	Matthias Brugger <matthias.bgg@gmail.com>,
	AngeloGioacchino Del Regno
	<angelogioacchino.delregno@collabora.com>
Cc: <linux-pm@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
	<linux-actions@lists.infradead.org>,
	<linux-arm-msm@vger.kernel.org>,
	<linux-arm-kernel@lists.infradead.org>,
	<linux-mediatek@lists.infradead.org>, Andrew Davis <afd@ti.com>
Subject: [PATCH v3 03/19] power: reset: xgene-reboot: Use devm_platform_ioremap_resource() helper
Date: Thu, 8 Feb 2024 11:03:54 -0600	[thread overview]
Message-ID: <20240208170410.67975-4-afd@ti.com> (raw)
In-Reply-To: <20240208170410.67975-1-afd@ti.com>

Use device life-cycle managed ioremap function to simplify probe and
exit paths.

While here add __iomem to the returned pointer to fix a sparse warning.

Signed-off-by: Andrew Davis <afd@ti.com>
---
 drivers/power/reset/xgene-reboot.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/drivers/power/reset/xgene-reboot.c b/drivers/power/reset/xgene-reboot.c
index c2e5a99940d37..6b545a83d8889 100644
--- a/drivers/power/reset/xgene-reboot.c
+++ b/drivers/power/reset/xgene-reboot.c
@@ -22,7 +22,7 @@
 
 struct xgene_reboot_context {
 	struct device *dev;
-	void *csr;
+	void __iomem *csr;
 	u32 mask;
 	struct notifier_block restart_handler;
 };
@@ -54,7 +54,7 @@ static int xgene_reboot_probe(struct platform_device *pdev)
 	if (!ctx)
 		return -ENOMEM;
 
-	ctx->csr = of_iomap(dev->of_node, 0);
+	ctx->csr = devm_platform_ioremap_resource(pdev, 0);
 	if (!ctx->csr) {
 		dev_err(dev, "can not map resource\n");
 		return -ENODEV;
@@ -67,10 +67,8 @@ static int xgene_reboot_probe(struct platform_device *pdev)
 	ctx->restart_handler.notifier_call = xgene_restart_handler;
 	ctx->restart_handler.priority = 128;
 	err = register_restart_handler(&ctx->restart_handler);
-	if (err) {
-		iounmap(ctx->csr);
+	if (err)
 		dev_err(dev, "cannot register restart handler (err=%d)\n", err);
-	}
 
 	return err;
 }
-- 
2.39.2


WARNING: multiple messages have this Message-ID (diff)
From: Andrew Davis <afd@ti.com>
To: Sebastian Reichel <sre@kernel.org>,
	Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>,
	Cristian Ciocaltea <cristian.ciocaltea@gmail.com>,
	Florian Fainelli <florian.fainelli@broadcom.com>,
	Ray Jui <rjui@broadcom.com>,
	Scott Branden <sbranden@broadcom.com>,
	Bjorn Andersson <andersson@kernel.org>,
	Konrad Dybcio <konrad.dybcio@linaro.org>,
	Sean Wang <sean.wang@mediatek.com>,
	Matthias Brugger <matthias.bgg@gmail.com>,
	AngeloGioacchino Del Regno
	<angelogioacchino.delregno@collabora.com>
Cc: <linux-pm@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
	<linux-actions@lists.infradead.org>,
	<linux-arm-msm@vger.kernel.org>,
	<linux-arm-kernel@lists.infradead.org>,
	<linux-mediatek@lists.infradead.org>, Andrew Davis <afd@ti.com>
Subject: [PATCH v3 03/19] power: reset: xgene-reboot: Use devm_platform_ioremap_resource() helper
Date: Thu, 8 Feb 2024 11:03:54 -0600	[thread overview]
Message-ID: <20240208170410.67975-4-afd@ti.com> (raw)
In-Reply-To: <20240208170410.67975-1-afd@ti.com>

Use device life-cycle managed ioremap function to simplify probe and
exit paths.

While here add __iomem to the returned pointer to fix a sparse warning.

Signed-off-by: Andrew Davis <afd@ti.com>
---
 drivers/power/reset/xgene-reboot.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/drivers/power/reset/xgene-reboot.c b/drivers/power/reset/xgene-reboot.c
index c2e5a99940d37..6b545a83d8889 100644
--- a/drivers/power/reset/xgene-reboot.c
+++ b/drivers/power/reset/xgene-reboot.c
@@ -22,7 +22,7 @@
 
 struct xgene_reboot_context {
 	struct device *dev;
-	void *csr;
+	void __iomem *csr;
 	u32 mask;
 	struct notifier_block restart_handler;
 };
@@ -54,7 +54,7 @@ static int xgene_reboot_probe(struct platform_device *pdev)
 	if (!ctx)
 		return -ENOMEM;
 
-	ctx->csr = of_iomap(dev->of_node, 0);
+	ctx->csr = devm_platform_ioremap_resource(pdev, 0);
 	if (!ctx->csr) {
 		dev_err(dev, "can not map resource\n");
 		return -ENODEV;
@@ -67,10 +67,8 @@ static int xgene_reboot_probe(struct platform_device *pdev)
 	ctx->restart_handler.notifier_call = xgene_restart_handler;
 	ctx->restart_handler.priority = 128;
 	err = register_restart_handler(&ctx->restart_handler);
-	if (err) {
-		iounmap(ctx->csr);
+	if (err)
 		dev_err(dev, "cannot register restart handler (err=%d)\n", err);
-	}
 
 	return err;
 }
-- 
2.39.2


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

  parent reply	other threads:[~2024-02-08 17:04 UTC|newest]

Thread overview: 52+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-02-08 17:03 [PATCH v3 00/19] Remove pm_power_off use in drivers/power/reset Andrew Davis
2024-02-08 17:03 ` Andrew Davis
2024-02-08 17:03 ` [PATCH v3 01/19] power: reset: atc260x-poweroff: Use devm_register_sys_off_handler(RESTART) Andrew Davis
2024-02-08 17:03   ` Andrew Davis
2024-02-08 17:03 ` [PATCH v3 02/19] power: reset: atc260x-poweroff: Use devm_register_sys_off_handler(POWER_OFF) Andrew Davis
2024-02-08 17:03   ` Andrew Davis
2024-02-08 17:03 ` Andrew Davis [this message]
2024-02-08 17:03   ` [PATCH v3 03/19] power: reset: xgene-reboot: Use devm_platform_ioremap_resource() helper Andrew Davis
2024-02-08 17:03 ` [PATCH v3 04/19] power: reset: xgene-reboot: Use devm_register_sys_off_handler(RESTART) Andrew Davis
2024-02-08 17:03   ` Andrew Davis
2024-02-08 17:03 ` [PATCH v3 05/19] power: reset: tps65086-restart: " Andrew Davis
2024-02-08 17:03   ` Andrew Davis
2024-02-08 17:03 ` [PATCH v3 06/19] power: reset: tps65086-restart: Remove unneeded device data struct Andrew Davis
2024-02-08 17:03   ` Andrew Davis
2024-02-08 17:03 ` [PATCH v3 07/19] power: reset: brcm-kona-reset: Use devm_register_sys_off_handler(RESTART) Andrew Davis
2024-02-08 17:03   ` Andrew Davis
2024-02-10  3:06   ` Florian Fainelli
2024-02-10  3:06     ` Florian Fainelli
2024-02-08 17:03 ` [PATCH v3 08/19] power: reset: axxia-reset: " Andrew Davis
2024-02-08 17:03   ` Andrew Davis
2024-02-08 17:04 ` [PATCH v3 09/19] power: reset: rmobile-reset: Use devm_platform_ioremap_resource() helper Andrew Davis
2024-02-08 17:04   ` Andrew Davis
2024-02-08 17:04 ` [PATCH v3 10/19] power: reset: rmobile-reset: Use devm_register_sys_off_handler(RESTART) Andrew Davis
2024-02-08 17:04   ` Andrew Davis
2024-02-08 17:04 ` [PATCH v3 11/19] power: reset: mt6323-poweroff: Use devm_register_sys_off_handler(POWER_OFF) Andrew Davis
2024-02-08 17:04   ` Andrew Davis
2024-02-09  8:54   ` AngeloGioacchino Del Regno
2024-02-09  8:54     ` AngeloGioacchino Del Regno
2024-02-08 17:04 ` [PATCH v3 12/19] power: reset: msm-poweroff: " Andrew Davis
2024-02-08 17:04   ` Andrew Davis
2024-02-08 17:04 ` [PATCH v3 13/19] power: reset: msm-poweroff: Use devm_register_sys_off_handler(RESTART) Andrew Davis
2024-02-08 17:04   ` Andrew Davis
2024-02-12 12:06   ` kernel test robot
2024-02-12 12:06     ` kernel test robot
2024-02-08 17:04 ` [PATCH v3 14/19] power: reset: regulator-poweroff: Use devm_register_sys_off_handler(POWER_OFF) Andrew Davis
2024-02-08 17:04   ` Andrew Davis
2024-02-08 17:04 ` [PATCH v3 15/19] power: reset: as3722-poweroff: " Andrew Davis
2024-02-08 17:04   ` Andrew Davis
2024-02-08 17:04 ` [PATCH v3 16/19] power: reset: gemini-poweroff: " Andrew Davis
2024-02-08 17:04   ` Andrew Davis
2024-02-08 17:04 ` [PATCH v3 17/19] power: reset: restart-poweroff: " Andrew Davis
2024-02-08 17:04   ` Andrew Davis
2024-02-08 17:04 ` [PATCH v3 18/19] power: reset: syscon-poweroff: Move device data into a struct Andrew Davis
2024-02-08 17:04   ` Andrew Davis
2024-02-11 23:52   ` Sebastian Reichel
2024-02-11 23:52     ` Sebastian Reichel
2024-02-12 16:13     ` Andrew Davis
2024-02-12 16:13       ` Andrew Davis
2024-02-08 17:04 ` [PATCH v3 19/19] power: reset: syscon-poweroff: Use devm_register_sys_off_handler(POWER_OFF) Andrew Davis
2024-02-08 17:04   ` Andrew Davis
2024-02-11 23:54 ` [PATCH v3 00/19] Remove pm_power_off use in drivers/power/reset Sebastian Reichel
2024-02-11 23:54   ` Sebastian Reichel

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=20240208170410.67975-4-afd@ti.com \
    --to=afd@ti.com \
    --cc=andersson@kernel.org \
    --cc=angelogioacchino.delregno@collabora.com \
    --cc=cristian.ciocaltea@gmail.com \
    --cc=florian.fainelli@broadcom.com \
    --cc=konrad.dybcio@linaro.org \
    --cc=linux-actions@lists.infradead.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-arm-msm@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mediatek@lists.infradead.org \
    --cc=linux-pm@vger.kernel.org \
    --cc=manivannan.sadhasivam@linaro.org \
    --cc=matthias.bgg@gmail.com \
    --cc=rjui@broadcom.com \
    --cc=sbranden@broadcom.com \
    --cc=sean.wang@mediatek.com \
    --cc=sre@kernel.org \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.