| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <cfb7743b-03b0-96c4-fcc3-7095694f6fbb@linaro.org>
Date: Mon, 17 Apr 2023 11:52:36 +0200
From: Daniel Lezcano <daniel.lezcano@...aro.org>
To: void0red@...t.edu.cn
Cc: amitk@...nel.org, angelogioacchino.delregno@...labora.com,
bchihi@...libre.com, daniel@...rotopia.org, dzm91@...t.edu.cn,
error27@...il.com, henry.yen@...iatek.com,
hust-os-kernel-patches@...glegroups.com,
linux-arm-kernel@...ts.infradead.org, linux-kernel@...r.kernel.org,
linux-mediatek@...ts.infradead.org, linux-pm@...r.kernel.org,
matthias.bgg@...il.com, rafael@...nel.org, rdunlap@...radead.org,
rui.zhang@...el.com, void0red@...il.com
Subject: Re: [PATCH v3 2/2] thermal: mediatek: change clk_prepare_enable to
devm_clk_get_enabled in mtk_thermal_probe
Hi,
this patch does not apply:
Analyzing 9 messages in the thread
Will use the latest revision: v3
You can pick other revisions using the -vN flag
Checking attestation on all messages, may take a moment...
---
[PATCH v3 2/2] thermal: mediatek: change clk_prepare_enable to
devm_clk_get_enabled in mtk_thermal_probe
+ Signed-off-by: Daniel Lezcano <daniel.lezcano@...aro.org>
+ Link:
https://lore.kernel.org/r/20230411063531.3976354-2-void0red@hust.edu.cn
---
Total patches: 1 (cherrypicked: 2)
---
Link:
https://lore.kernel.org/r/20230411063531.3976354-1-void0red@hust.edu.cn
Base: not specified
Applying: thermal: mediatek: change clk_prepare_enable to
devm_clk_get_enabled in mtk_thermal_probe
error: patch failed: drivers/thermal/mediatek/auxadc_thermal.c:1182
error: drivers/thermal/mediatek/auxadc_thermal.c: patch does not apply
Patch failed at 0001 thermal: mediatek: change clk_prepare_enable to
devm_clk_get_enabled in mtk_thermal_probe
hint: Use 'git am --show-current-patch=diff' to see the failed patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
On 15/04/2023 09:14, void0red@...t.edu.cn wrote:
>
>
>
>> -----Original Messages-----
>> From: "Kang Chen" <void0red@...t.edu.cn>
>> Sent Time: 2023-04-11 14:35:31 (Tuesday)
>> To: daniel.lezcano@...aro.org
>> Cc: amitk@...nel.org, angelogioacchino.delregno@...labora.com, bchihi@...libre.com, daniel@...rotopia.org, dzm91@...t.edu.cn, error27@...il.com, henry.yen@...iatek.com, hust-os-kernel-patches@...glegroups.com, linux-arm-kernel@...ts.infradead.org, linux-kernel@...r.kernel.org, linux-mediatek@...ts.infradead.org, linux-pm@...r.kernel.org, matthias.bgg@...il.com, rafael@...nel.org, rdunlap@...radead.org, rui.zhang@...el.com, void0red@...il.com, void0red@...t.edu.cn
>> Subject: [PATCH v3 2/2] thermal: mediatek: change clk_prepare_enable to devm_clk_get_enabled in mtk_thermal_probe
>>
>> use devm_clk_get_enabled to do automatic resource management.
>> Meanwhile, remove error handling labels in the probe function and
>> the whole remove function.
>>
>> Signed-off-by: Kang Chen <void0red@...t.edu.cn>
>> Reviewed-by: Dongliang Mu <dzm91@...t.edu.cn>
>> ---
>> v3 -> v2: remove some useles func calls.
>> v2 -> v1: init
>>
>> Notice the devm_clk_get_enabled do the clk_get and clk_prepare_enable
>> at the same time.
>> I'm not sure if this has any side effects in initialization.
>>
>> drivers/thermal/mediatek/auxadc_thermal.c | 48 +++++------------------
>> 1 file changed, 10 insertions(+), 38 deletions(-)
>>
>> diff --git a/drivers/thermal/mediatek/auxadc_thermal.c b/drivers/thermal/mediatek/auxadc_thermal.c
>> index 3372f7c29626..995837ce3ea2 100644
>> --- a/drivers/thermal/mediatek/auxadc_thermal.c
>> +++ b/drivers/thermal/mediatek/auxadc_thermal.c
>> @@ -1116,14 +1116,6 @@ static int mtk_thermal_probe(struct platform_device *pdev)
>>
>> mt->conf = of_device_get_match_data(&pdev->dev);
>>
>> - mt->clk_peri_therm = devm_clk_get(&pdev->dev, "therm");
>> - if (IS_ERR(mt->clk_peri_therm))
>> - return PTR_ERR(mt->clk_peri_therm);
>> -
>> - mt->clk_auxadc = devm_clk_get(&pdev->dev, "auxadc");
>> - if (IS_ERR(mt->clk_auxadc))
>> - return PTR_ERR(mt->clk_auxadc);
>> -
>> mt->thermal_base = devm_platform_get_and_ioremap_resource(pdev, 0, NULL);
>> if (IS_ERR(mt->thermal_base))
>> return PTR_ERR(mt->thermal_base);
>> @@ -1182,16 +1174,16 @@ static int mtk_thermal_probe(struct platform_device *pdev)
>> if (ret)
>> return ret;
>>
>> - ret = clk_prepare_enable(mt->clk_auxadc);
>> - if (ret) {
>> - dev_err(&pdev->dev, "Can't enable auxadc clk: %d\n", ret);
>> - return ret;
>> + mt->clk_auxadc = devm_clk_get_enabled(&pdev->dev, "auxadc");
>> + if (IS_ERR(mt->clk_auxadc)) {
>> + dev_err(&pdev->dev, "Can't enable auxadc clk: %d\n", mt->clk_auxadc);
>> + return PTR_ERR(mt->clk_auxadc);
>> }
>>
>> - ret = clk_prepare_enable(mt->clk_peri_therm);
>> - if (ret) {
>> - dev_err(&pdev->dev, "Can't enable peri clk: %d\n", ret);
>> - goto err_disable_clk_auxadc;
>> + mt->clk_peri_therm = devm_clk_get_enabled(&pdev->dev, "therm");
>> + if (IS_ERR(mt->clk_peri_therm)) {
>> + dev_err(&pdev->dev, "Can't enable peri clk: %d\n", mt->clk_peri_therm);
>> + return PTR_ERR(mt->clk_peri_therm);
>> }
>>
>> if (mt->conf->version != MTK_THERMAL_V1) {
>> @@ -1215,38 +1207,18 @@ static int mtk_thermal_probe(struct platform_device *pdev)
>>
>> tzdev = devm_thermal_of_zone_register(&pdev->dev, 0, mt,
>> &mtk_thermal_ops);
>> - if (IS_ERR(tzdev)) {
>> - ret = PTR_ERR(tzdev);
>> - goto err_disable_clk_peri_therm;
>> - }
>> + if (IS_ERR(tzdev))
>> + return PTR_ERR(tzdev);
>>
>> ret = devm_thermal_add_hwmon_sysfs(tzdev);
>> if (ret)
>> dev_warn(&pdev->dev, "error in thermal_add_hwmon_sysfs");
>>
>> return 0;
>> -
>> -err_disable_clk_peri_therm:
>> - clk_disable_unprepare(mt->clk_peri_therm);
>> -err_disable_clk_auxadc:
>> - clk_disable_unprepare(mt->clk_auxadc);
>> -
>> - return ret;
>> -}
>> -
>> -static int mtk_thermal_remove(struct platform_device *pdev)
>> -{
>> - struct mtk_thermal *mt = platform_get_drvdata(pdev);
>> -
>> - clk_disable_unprepare(mt->clk_peri_therm);
>> - clk_disable_unprepare(mt->clk_auxadc);
>> -
>> - return 0;
>> }
>>
>> static struct platform_driver mtk_thermal_driver = {
>> .probe = mtk_thermal_probe,
>> - .remove = mtk_thermal_remove,
>> .driver = {
>> .name = "mtk-thermal",
>> .of_match_table = mtk_thermal_of_match,
>> --
>> 2.34.1
>
> ping?
--
<http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs
Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog
Powered by blists - more mailing lists