linux-arm-msm.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Amit Kucheria <amit.kucheria@linaro.org>
To: linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org,
	daniel.lezcano@linaro.org, bjorn.andersson@linaro.org,
	swboyd@chromium.org, sivaa@codeaurora.org,
	Andy Gross <agross@kernel.org>
Cc: Amit Kucheria <amit.kucheria@verdurent.com>, linux-pm@vger.kernel.org
Subject: [PATCH v6 4/8] drivers: thermal: tsens: Release device in success path
Date: Mon, 24 Feb 2020 18:28:51 +0530	[thread overview]
Message-ID: <9210fe430e75f6e971358c1db823d69ccab43580.1582548319.git.amit.kucheria@linaro.org> (raw)
In-Reply-To: <cover.1582548319.git.amit.kucheria@linaro.org>

We don't currently call put_device in case of successfully initialising
the device. So we hold the reference and keep the device pinned forever.

Allow control to fall through so we can use same code for success and
error paths to put_device.

As a part of this fixup, change devm_ioremap_resource to act on the same
device pointer as that used to allocate regmap memory. That ensures that
we are free to release op->dev after examining its resources.

Signed-off-by: Amit Kucheria <amit.kucheria@linaro.org>
Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Link: https://lore.kernel.org/r/9fa8a4e09b6fcff4b9d4facc9f9e9f8e3c4a41d5.1582048155.git.amit.kucheria@linaro.org
---
 drivers/thermal/qcom/tsens-common.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/thermal/qcom/tsens-common.c b/drivers/thermal/qcom/tsens-common.c
index 1cbc5a6e5b4f..013750fff8b2 100644
--- a/drivers/thermal/qcom/tsens-common.c
+++ b/drivers/thermal/qcom/tsens-common.c
@@ -602,7 +602,7 @@ int __init init_common(struct tsens_priv *priv)
 		/* DT with separate SROT and TM address space */
 		priv->tm_offset = 0;
 		res = platform_get_resource(op, IORESOURCE_MEM, 1);
-		srot_base = devm_ioremap_resource(&op->dev, res);
+		srot_base = devm_ioremap_resource(dev, res);
 		if (IS_ERR(srot_base)) {
 			ret = PTR_ERR(srot_base);
 			goto err_put_device;
@@ -620,7 +620,7 @@ int __init init_common(struct tsens_priv *priv)
 	}
 
 	res = platform_get_resource(op, IORESOURCE_MEM, 0);
-	tm_base = devm_ioremap_resource(&op->dev, res);
+	tm_base = devm_ioremap_resource(dev, res);
 	if (IS_ERR(tm_base)) {
 		ret = PTR_ERR(tm_base);
 		goto err_put_device;
@@ -687,8 +687,6 @@ int __init init_common(struct tsens_priv *priv)
 	tsens_enable_irq(priv);
 	tsens_debug_init(op);
 
-	return 0;
-
 err_put_device:
 	put_device(&op->dev);
 	return ret;
-- 
2.20.1


  parent reply	other threads:[~2020-02-24 12:59 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-02-24 12:58 [PATCH v6 0/8] thermal: tsens: Handle critical interrupts Amit Kucheria
2020-02-24 12:58 ` [PATCH v6 1/8] drivers: thermal: tsens: De-constify struct tsens_features Amit Kucheria
2020-02-24 12:58 ` [PATCH v6 2/8] drivers: thermal: tsens: Pass around struct tsens_sensor as a constant Amit Kucheria
2020-02-24 12:58 ` [PATCH v6 3/8] drivers: thermal: tsens: use simpler variables Amit Kucheria
2020-02-24 12:58 ` Amit Kucheria [this message]
2020-02-24 12:58 ` [PATCH v6 5/8] drivers: thermal: tsens: Add critical interrupt support Amit Kucheria
2020-02-24 12:58 ` [PATCH v6 6/8] drivers: thermal: tsens: Add watchdog support Amit Kucheria
2020-02-24 12:58 ` [PATCH v6 7/8] drivers: thermal: tsens: kernel-doc fixup Amit Kucheria
2020-02-24 12:58 ` [PATCH v6 8/8] drivers: thermal: tsens: Remove unnecessary irq flag Amit Kucheria
2020-03-12 10:50 ` [PATCH v6 0/8] thermal: tsens: Handle critical interrupts Daniel Lezcano
2020-03-12 12:33   ` Amit Kucheria

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=9210fe430e75f6e971358c1db823d69ccab43580.1582548319.git.amit.kucheria@linaro.org \
    --to=amit.kucheria@linaro.org \
    --cc=agross@kernel.org \
    --cc=amit.kucheria@verdurent.com \
    --cc=bjorn.andersson@linaro.org \
    --cc=daniel.lezcano@linaro.org \
    --cc=linux-arm-msm@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-pm@vger.kernel.org \
    --cc=sivaa@codeaurora.org \
    --cc=swboyd@chromium.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 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).