linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 1/6] thermal: qoriq: Use devm_platform_ioremap_resource() instead of of_iomap()
@ 2019-07-05  4:56 Anson.Huang
  2019-07-05  4:56 ` [PATCH 2/6] thermal: qoriq: Use __maybe_unused instead of #if CONFIG_PM_SLEEP Anson.Huang
                   ` (4 more replies)
  0 siblings, 5 replies; 28+ messages in thread
From: Anson.Huang @ 2019-07-05  4:56 UTC (permalink / raw)
  To: rui.zhang, edubezval, daniel.lezcano, robh+dt, mark.rutland,
	shawnguo, s.hauer, kernel, festevam, mturquette, sboyd, l.stach,
	abel.vesa, andrew.smirnov, angus, ccaione, agx, leonard.crestez,
	linux-pm, devicetree, linux-kernel, linux-arm-kernel, linux-clk
  Cc: Linux-imx

From: Anson Huang <Anson.Huang@nxp.com>

Use devm_platform_ioremap_resource() instead of of_iomap() to
save the iounmap() call in error handle path;

Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
---
 drivers/thermal/qoriq_thermal.c | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/drivers/thermal/qoriq_thermal.c b/drivers/thermal/qoriq_thermal.c
index 7b36493..c7c7de2 100644
--- a/drivers/thermal/qoriq_thermal.c
+++ b/drivers/thermal/qoriq_thermal.c
@@ -202,32 +202,27 @@ static int qoriq_tmu_probe(struct platform_device *pdev)
 
 	data->little_endian = of_property_read_bool(np, "little-endian");
 
-	data->regs = of_iomap(np, 0);
-	if (!data->regs) {
+	data->regs = devm_platform_ioremap_resource(pdev, 0);
+	if (IS_ERR(data->regs)) {
 		dev_err(&pdev->dev, "Failed to get memory region\n");
-		ret = -ENODEV;
-		goto err_iomap;
+		return PTR_ERR(data->regs);
 	}
 
 	qoriq_tmu_init_device(data);	/* TMU initialization */
 
 	ret = qoriq_tmu_calibration(pdev);	/* TMU calibration */
 	if (ret < 0)
-		goto err_tmu;
+		goto err;
 
 	ret = qoriq_tmu_register_tmu_zone(pdev);
 	if (ret < 0) {
 		dev_err(&pdev->dev, "Failed to register sensors\n");
-		ret = -ENODEV;
-		goto err_iomap;
+		goto err;
 	}
 
 	return 0;
 
-err_tmu:
-	iounmap(data->regs);
-
-err_iomap:
+err:
 	platform_set_drvdata(pdev, NULL);
 
 	return ret;
@@ -240,7 +235,6 @@ static int qoriq_tmu_remove(struct platform_device *pdev)
 	/* Disable monitoring */
 	tmu_write(data, TMR_DISABLE, &data->regs->tmr);
 
-	iounmap(data->regs);
 	platform_set_drvdata(pdev, NULL);
 
 	return 0;
-- 
2.7.4


^ permalink raw reply related	[flat|nested] 28+ messages in thread

end of thread, other threads:[~2019-07-29  8:40 UTC | newest]

Thread overview: 28+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-07-05  4:56 [PATCH 1/6] thermal: qoriq: Use devm_platform_ioremap_resource() instead of of_iomap() Anson.Huang
2019-07-05  4:56 ` [PATCH 2/6] thermal: qoriq: Use __maybe_unused instead of #if CONFIG_PM_SLEEP Anson.Huang
2019-07-05  4:56 ` [PATCH 3/6] dt-bindings: thermal: qoriq: Add optional clocks property Anson.Huang
2019-07-22 23:55   ` Rob Herring
2019-07-05  4:56 ` [PATCH 4/6] thermal: qoriq: Add clock operations Anson.Huang
2019-07-29  8:12   ` Guido Günther
2019-07-29  8:40     ` Anson Huang
2019-07-05  4:56 ` [PATCH 5/6] clk: imx8mq: Remove CLK_IS_CRITICAL flag for IMX8MQ_CLK_TMU_ROOT Anson.Huang
2019-07-05  7:01   ` Abel Vesa
2019-07-22 21:31   ` Stephen Boyd
2019-07-23  2:50   ` Shawn Guo
2019-07-26 22:26   ` Daniel Baluta
2019-07-27  6:19     ` Anson Huang
2019-07-27  6:33       ` Daniel Baluta
2019-07-27 16:17         ` Abel Vesa
2019-07-29  1:29           ` Anson Huang
2019-07-29  6:51             ` Daniel Baluta
2019-07-29  7:14               ` Anson Huang
2019-07-29  7:20                 ` Daniel Baluta
2019-07-29  7:21                   ` Daniel Baluta
2019-07-29  7:49                     ` Anson Huang
2019-07-29  8:13                       ` Daniel Baluta
2019-07-27 18:26     ` Guido Günther
2019-07-27 20:17       ` Fabio Estevam
2019-07-28  7:58         ` Guido Günther
2019-07-28 15:24           ` Fabio Estevam
2019-07-05  4:56 ` [PATCH 6/6] arm64: dts: imx8mq: Add clock for TMU node Anson.Huang
2019-07-23  2:51   ` Shawn Guo

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).