iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

regulator: qcom_spmi-regulator: Clean-up by using managed work init

Browse Source 
Few drivers implement remove call-back only for ensuring a delayed
work gets cancelled prior driver removal. Clean-up these by switching
to use devm_delayed_work_autocancel() instead.

Additionally, this helps avoiding mixing devm and manual resource
management and cleans up a (theoretical?) bug where devm managed
over-current IRQ might schedule a new work item after wq was cleaned
at remove().

This change is compile-tested only. All testing is appreciated.

Signed-off-by: Matti Vaittinen <matti.vaittinen@fi.rohmeurope.com>
Link: https://lore.kernel.org/r/3bd35bb43257f4bf5b99f75d207ed5e1e08d1d38.1616506559.git.matti.vaittinen@fi.rohmeurope.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Matti Vaittinen 2021-03-23 15:58:11 +02:00 committed by Greg Kroah-Hartman
parent 6d0c5de2fd
commit b668801515
1 changed files with 8 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
drivers/regulator/qcom_spmi-regulator.c
View File

@ -5,6 +5,7 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/devm-helpers.h>
#include <linux/err.h> #include <linux/err.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
@ -1842,7 +1843,10 @@ static int spmi_regulator_of_parse(struct device_node *node,
return ret; return ret;
} }
INIT_DELAYED_WORK(&vreg->ocp_work, spmi_regulator_vs_ocp_work); ret = devm_delayed_work_autocancel(dev, &vreg->ocp_work,
spmi_regulator_vs_ocp_work);
if (ret)
return ret;
} }
return 0; return 0;
@ -2157,10 +2161,8 @@ static int qcom_spmi_regulator_probe(struct platform_device *pdev)
vreg->regmap = regmap; vreg->regmap = regmap;
if (reg->ocp) { if (reg->ocp) {
vreg->ocp_irq = platform_get_irq_byname(pdev, reg->ocp); vreg->ocp_irq = platform_get_irq_byname(pdev, reg->ocp);
if (vreg->ocp_irq < 0) { if (vreg->ocp_irq < 0)
ret = vreg->ocp_irq; return vreg->ocp_irq;
goto err;
}
} }
vreg->desc.id = -1; vreg->desc.id = -1;
vreg->desc.owner = THIS_MODULE; vreg->desc.owner = THIS_MODULE;
@ -2203,8 +2205,7 @@ static int qcom_spmi_regulator_probe(struct platform_device *pdev)
rdev = devm_regulator_register(dev, &vreg->desc, &config); rdev = devm_regulator_register(dev, &vreg->desc, &config);
if (IS_ERR(rdev)) { if (IS_ERR(rdev)) {
dev_err(dev, "failed to register %s\n", name); dev_err(dev, "failed to register %s\n", name);
ret = PTR_ERR(rdev); return PTR_ERR(rdev);
goto err;
} }
INIT_LIST_HEAD(&vreg->node); INIT_LIST_HEAD(&vreg->node);
@ -2212,24 +2213,6 @@ static int qcom_spmi_regulator_probe(struct platform_device *pdev)
} }
return 0; return 0;
err:
list_for_each_entry(vreg, vreg_list, node)
if (vreg->ocp_irq)
cancel_delayed_work_sync(&vreg->ocp_work);
return ret;
}
static int qcom_spmi_regulator_remove(struct platform_device *pdev)
{
struct spmi_regulator *vreg;
struct list_head *vreg_list = platform_get_drvdata(pdev);
list_for_each_entry(vreg, vreg_list, node)
if (vreg->ocp_irq)
cancel_delayed_work_sync(&vreg->ocp_work);
return 0;
} }
static struct platform_driver qcom_spmi_regulator_driver = { static struct platform_driver qcom_spmi_regulator_driver = {
@ -2238,7 +2221,6 @@ static struct platform_driver qcom_spmi_regulator_driver = {
.of_match_table = qcom_spmi_regulator_match, .of_match_table = qcom_spmi_regulator_match,
}, },
.probe = qcom_spmi_regulator_probe, .probe = qcom_spmi_regulator_probe,
.remove = qcom_spmi_regulator_remove,
}; };
module_platform_driver(qcom_spmi_regulator_driver); module_platform_driver(qcom_spmi_regulator_driver);