From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
To: Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
Mark Brown <broonie@kernel.org>,
Aidan MacDonald <aidanmacdonald.0x0@gmail.com>,
linux-kernel@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
"Rafael J. Wysocki" <rafael@kernel.org>
Subject: [PATCH v1 1/5] regmap: mmio: Don't unprepare attached clock
Date: Fri, 5 Aug 2022 23:53:17 +0300 [thread overview]
Message-ID: <20220805205321.19452-1-andriy.shevchenko@linux.intel.com> (raw)
The commit eb4a219d19fd ("regmap: Skip clk_put for attached clocks when
freeing context") oexcluded clk_put() call on regmap freeing. But the
same is needed for clk_unprepare() since the regmap MMIO users should
call regmap_mmio_detach_clk() which does unprepare the clock. Update
the code accordingly, so neither clk_put() nor clk_unprepare() would
be called for the attached clock.
Fixes: eb4a219d19fd ("regmap: Skip clk_put for attached clocks when freeing context")
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
drivers/base/regmap/regmap-mmio.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/drivers/base/regmap/regmap-mmio.c b/drivers/base/regmap/regmap-mmio.c
index 71f16be7e717..e83a2c3ba95a 100644
--- a/drivers/base/regmap/regmap-mmio.c
+++ b/drivers/base/regmap/regmap-mmio.c
@@ -245,10 +245,9 @@ static void regmap_mmio_free_context(void *context)
{
struct regmap_mmio_context *ctx = context;
- if (!IS_ERR(ctx->clk)) {
+ if (!IS_ERR(ctx->clk) && !ctx->attached_clk) {
clk_unprepare(ctx->clk);
- if (!ctx->attached_clk)
- clk_put(ctx->clk);
+ clk_put(ctx->clk);
}
kfree(context);
}
--
2.35.1
next reply other threads:[~2022-08-05 20:53 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-05 20:53 Andy Shevchenko [this message]
2022-08-05 20:53 ` [PATCH v1 2/5] regmap: mmio: Drop unneeded and duplicative checks around CLK calls Andy Shevchenko
2022-08-08 13:02 ` Mark Brown
2022-08-08 13:43 ` Andy Shevchenko
2022-08-05 20:53 ` [PATCH v1 3/5] regmap: mmio: Remove mmio_relaxed member from context Andy Shevchenko
2022-08-05 20:53 ` [PATCH v1 4/5] regmap: mmio: Get rid of broken 64-bit IO Andy Shevchenko
2022-08-05 20:53 ` [PATCH v1 5/5] regmap: mmio: Introduce IO accessors that can talk to IO port Andy Shevchenko
2022-08-05 21:22 ` Andy Shevchenko
2022-08-08 13:18 ` Mark Brown
2022-08-08 14:40 ` Andy Shevchenko
2022-08-08 16:04 ` Mark Brown
2022-08-08 18:39 ` Andy Shevchenko
2022-08-08 13:07 ` [PATCH v1 1/5] regmap: mmio: Don't unprepare attached clock Mark Brown
2022-08-08 13:41 ` Andy Shevchenko
2022-08-08 13:48 ` Mark Brown
2022-08-08 14:42 ` Andy Shevchenko
2022-08-08 15:52 ` Mark Brown
2022-08-08 18:23 ` Andy Shevchenko
2022-08-08 19:01 ` Mark Brown
2022-08-15 17:42 ` (subset) " Mark Brown
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=20220805205321.19452-1-andriy.shevchenko@linux.intel.com \
--to=andriy.shevchenko@linux.intel.com \
--cc=aidanmacdonald.0x0@gmail.com \
--cc=broonie@kernel.org \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=rafael@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox