From: Matti Vaittinen <matti.vaittinen@fi.rohmeurope.com>
To: mazziesaccount@gmail.com, matti.vaittinen@fi.rohmeurope.com
Cc: david.brown@linaro.org, linux-clk@vger.kernel.org,
b.zolnierkie@samsung.com, sboyd@kernel.org,
linux-kernel@vger.kernel.org, mturquette@baylibre.com,
rafael.j.wysocki@intel.com, linux-doc@vger.kernel.org,
linux@armlinux.org.uk, krzk@kernel.org, akshu.agrawal@amd.com,
cw00.choi@samsung.com, djkurtz@chromium.org, pavel@ucw.cz,
pombredanne@nexb.com, andy.gross@linaro.org,
andrew.smirnov@gmail.com, lee.jones@linaro.org,
sjhuang@iluvatar.ai, linux-arm-kernel@lists.infradead.org
Subject: [PATCH v5 3/9] clk: clk-max77686: Clean clkdev lookup leak and use devm
Date: Mon, 3 Dec 2018 14:19:35 +0200 [thread overview]
Message-ID: <beed6f8e43052b2d80d386444f57574b2ec0dd56.1543837442.git.matti.vaittinen@fi.rohmeurope.com> (raw)
In-Reply-To: <cover.1543837442.git.matti.vaittinen@fi.rohmeurope.com>
clk-max77686 never clean clkdev lookup at remove. This can cause
oops if clk-max77686 is removed and inserted again. Fix leak by
using new devm clkdev lookup registration. Simplify also error
path by using new devm_of_clk_add_parent_hw_provider.
Signed-off-by: Matti Vaittinen <matti.vaittinen@fi.rohmeurope.com>
Reviewed-by: Krzysztof Kozlowski <krzk@kernel.org>
---
drivers/clk/clk-max77686.c | 29 +++++++----------------------
1 file changed, 7 insertions(+), 22 deletions(-)
diff --git a/drivers/clk/clk-max77686.c b/drivers/clk/clk-max77686.c
index 22c937644c93..e65925d5e412 100644
--- a/drivers/clk/clk-max77686.c
+++ b/drivers/clk/clk-max77686.c
@@ -235,8 +235,9 @@ static int max77686_clk_probe(struct platform_device *pdev)
return ret;
}
- ret = clk_hw_register_clkdev(&max_clk_data->hw,
- max_clk_data->clk_idata.name, NULL);
+ ret = devm_clk_hw_register_clkdev(dev, &max_clk_data->hw,
+ max_clk_data->clk_idata.name,
+ NULL);
if (ret < 0) {
dev_err(dev, "Failed to clkdev register: %d\n", ret);
return ret;
@@ -244,8 +245,9 @@ static int max77686_clk_probe(struct platform_device *pdev)
}
if (parent->of_node) {
- ret = of_clk_add_hw_provider(parent->of_node, of_clk_max77686_get,
- drv_data);
+ ret = devm_of_clk_add_parent_hw_provider(dev,
+ of_clk_max77686_get,
+ drv_data);
if (ret < 0) {
dev_err(dev, "Failed to register OF clock provider: %d\n",
@@ -261,27 +263,11 @@ static int max77686_clk_probe(struct platform_device *pdev)
1 << MAX77802_CLOCK_LOW_JITTER_SHIFT);
if (ret < 0) {
dev_err(dev, "Failed to config low-jitter: %d\n", ret);
- goto remove_of_clk_provider;
+ return ret;
}
}
return 0;
-
-remove_of_clk_provider:
- if (parent->of_node)
- of_clk_del_provider(parent->of_node);
-
- return ret;
-}
-
-static int max77686_clk_remove(struct platform_device *pdev)
-{
- struct device *parent = pdev->dev.parent;
-
- if (parent->of_node)
- of_clk_del_provider(parent->of_node);
-
- return 0;
}
static const struct platform_device_id max77686_clk_id[] = {
@@ -297,7 +283,6 @@ static struct platform_driver max77686_clk_driver = {
.name = "max77686-clk",
},
.probe = max77686_clk_probe,
- .remove = max77686_clk_remove,
.id_table = max77686_clk_id,
};
--
2.14.3
--
Matti Vaittinen
ROHM Semiconductors
~~~ "I don't think so," said Rene Descartes. Just then, he vanished ~~~
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2018-12-03 12:20 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-03 12:17 [PATCH v5 0/9] clk: clkdev: managed clk lookup and provider registrations Matti Vaittinen
2018-12-03 12:17 ` [PATCH v5 1/9] clkdev: add managed clkdev lookup registration Matti Vaittinen
2018-12-03 18:06 ` Russell King - ARM Linux
2018-12-04 8:03 ` Matti Vaittinen
2018-12-03 12:18 ` [PATCH v5 2/9] clk: of_clk - add managed provider registrations Matti Vaittinen
2018-12-03 12:19 ` Matti Vaittinen [this message]
2018-12-03 12:19 ` [PATCH v5 0/9] clk: clkdev: managed clk lookup and " Lee Jones
2018-12-03 12:35 ` Matti Vaittinen
2018-12-03 12:56 ` Lee Jones
2018-12-03 12:20 ` [PATCH v5 4/9] clk: clk-st: avoid clkdev lookup leak at remove Matti Vaittinen
2018-12-03 12:20 ` [PATCH v5 5/9] clk: clk-hi655x: Free of_provider " Matti Vaittinen
2018-12-03 12:21 ` [PATCH v5 6/9] clk: rk808: use managed version of of_provider registration Matti Vaittinen
2018-12-03 12:22 ` [PATCH v5 7/9] clk: clk-twl6040: Free of_provider at remove Matti Vaittinen
2018-12-03 12:23 ` [PATCH v5 8/9] clk: apcs-msm8916: simplify probe cleanup by using devm Matti Vaittinen
2018-12-03 12:23 ` [PATCH v5 9/9] clk: bd718x7: Initial support for ROHM bd71837/bd71847 PMIC clock Matti Vaittinen
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=beed6f8e43052b2d80d386444f57574b2ec0dd56.1543837442.git.matti.vaittinen@fi.rohmeurope.com \
--to=matti.vaittinen@fi.rohmeurope.com \
--cc=akshu.agrawal@amd.com \
--cc=andrew.smirnov@gmail.com \
--cc=andy.gross@linaro.org \
--cc=b.zolnierkie@samsung.com \
--cc=cw00.choi@samsung.com \
--cc=david.brown@linaro.org \
--cc=djkurtz@chromium.org \
--cc=krzk@kernel.org \
--cc=lee.jones@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-clk@vger.kernel.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@armlinux.org.uk \
--cc=mazziesaccount@gmail.com \
--cc=mturquette@baylibre.com \
--cc=pavel@ucw.cz \
--cc=pombredanne@nexb.com \
--cc=rafael.j.wysocki@intel.com \
--cc=sboyd@kernel.org \
--cc=sjhuang@iluvatar.ai \
/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).