drivers/clk: Convert to DEFINE_SIMPLE_DEV_PM_OPS()
Subsystems (5)
PATCH 1/1 drivers/clk: Convert to DEFINE_SIMPLE_DEV_PM_OPS()
Convert the deprecated SIMPLE_DEV_PM_OPS
to DEFINE_SIMPLE_DEV_PM_OPS and pm_sleep_ptr().
This lets us drop the __maybe_unused annotations from its suspend and resume callbacks, and reduces kernel size in case CONFIG_PM or CONFIG_PM_SLEEP is disabled.
--- drivers/clk/clk-si521xx.c | 8 ++++---- drivers/clk/clk-versaclock5.c | 8 ++++---- drivers/clk/samsung/clk-exynos-clkout.c | 8 ++++---- drivers/clk/xilinx/clk-xlnx-clock-wizard.c | 8 ++++---- 4 files changed, 16 insertions(+), 16 deletions(-)
drivers/clk/clk-si521xx.c +4 -4
@@ -341,7 +341,7 @@ static int si521xx_probe(struct i2c_client *client)return ret; } -static int __maybe_unused si521xx_suspend (struct device *dev) +static int si521xx_suspend (struct device *dev) {struct si521xx *si =dev_get_drvdata (dev);
@@ -351,7 +351,7 @@ static int __maybe_unused si521xx_suspend(struct device *dev)return 0 ; } -static int __maybe_unused si521xx_resume (struct device *dev) +static int si521xx_resume (struct device *dev) {struct si521xx *si =dev_get_drvdata (dev);int ret;
@@ -379,12 +379,12 @@ static const struct of_device_id clk_si521xx_of_match[] = { };MODULE_DEVICE_TABLE (of, clk_si521xx_of_match); -static SIMPLE_DEV_PM_OPS(si521xx_pm_ops, si521xx_suspend, si521xx_resume); +static DEFINE_SIMPLE_DEV_PM_OPS(si521xx_pm_ops, si521xx_suspend, si521xx_resume);static struct i2c_driver si521xx_driver = { .driver = { .name ="clk-si521xx" , - .pm = &si521xx_pm_ops, + .pm =pm_sleep_ptr (&si521xx_pm_ops), .of_match_table = clk_si521xx_of_match, }, .probe = si521xx_probe,
drivers/clk/clk-versaclock5.c +4 -4
@@ -1223,7 +1223,7 @@ static void vc5_remove(struct i2c_client *client)clk_unregister_fixed_rate (vc5->pin_xin); } -static int __maybe_unused vc5_suspend (struct device *dev) +static int vc5_suspend (struct device *dev) {struct vc5_driver_data *vc5 =dev_get_drvdata (dev);
@@ -1233,7 +1233,7 @@ static int __maybe_unused vc5_suspend(struct device *dev)return 0 ; } -static int __maybe_unused vc5_resume (struct device *dev) +static int vc5_resume (struct device *dev) {struct vc5_driver_data *vc5 =dev_get_drvdata (dev);int ret;
@@ -1335,12 +1335,12 @@ static const struct of_device_id clk_vc5_of_match[] = { };MODULE_DEVICE_TABLE (of, clk_vc5_of_match); -static SIMPLE_DEV_PM_OPS(vc5_pm_ops, vc5_suspend, vc5_resume); +static DEFINE_SIMPLE_DEV_PM_OPS(vc5_pm_ops, vc5_suspend, vc5_resume);static struct i2c_driver vc5_driver = { .driver = { .name ="vc5" , - .pm = &vc5_pm_ops, + .pm =pm_sleep_ptr (&vc5_pm_ops), .of_match_table = clk_vc5_of_match, }, .probe = vc5_probe,
drivers/clk/samsung/clk-exynos-clkout.c +4 -4
@@ -214,7 +214,7 @@ static void exynos_clkout_remove(struct platform_device *pdev)iounmap (clkout->reg); } -static int __maybe_unused exynos_clkout_suspend (struct device *dev) +static int exynos_clkout_suspend (struct device *dev) {struct exynos_clkout *clkout =dev_get_drvdata (dev);
@@ -223,7 +223,7 @@ static int __maybe_unused exynos_clkout_suspend(struct device *dev)return 0 ; } -static int __maybe_unused exynos_clkout_resume (struct device *dev) +static int exynos_clkout_resume (struct device *dev) {struct exynos_clkout *clkout =dev_get_drvdata (dev);
@@ -232,13 +232,13 @@ static int __maybe_unused exynos_clkout_resume(struct device *dev)return 0 ; } -static SIMPLE_DEV_PM_OPS(exynos_clkout_pm_ops, exynos_clkout_suspend, +static DEFINE_SIMPLE_DEV_PM_OPS(exynos_clkout_pm_ops, exynos_clkout_suspend, exynos_clkout_resume);static struct platform_driver exynos_clkout_driver = { .driver = { .name =DRV_NAME , - .pm = &exynos_clkout_pm_ops, + .pm =pm_sleep_ptr (&exynos_clkout_pm_ops), }, .probe = exynos_clkout_probe, .remove = exynos_clkout_remove,
drivers/clk/xilinx/clk-xlnx-clock-wizard.c +4 -4
@@ -955,7 +955,7 @@ static int clk_wzrd_clk_notifier(struct notifier_block *nb, unsigned long event, } } -static int __maybe_unused clk_wzrd_suspend (struct device *dev) +static int clk_wzrd_suspend (struct device *dev) {struct clk_wzrd *clk_wzrd =dev_get_drvdata (dev);
@@ -965,7 +965,7 @@ static int __maybe_unused clk_wzrd_suspend(struct device *dev)return 0 ; } -static int __maybe_unused clk_wzrd_resume (struct device *dev) +static int clk_wzrd_resume (struct device *dev) {int ret;struct clk_wzrd *clk_wzrd =dev_get_drvdata (dev);
@@ -981,7 +981,7 @@ static int __maybe_unused clk_wzrd_resume(struct device *dev)return 0 ; } -static SIMPLE_DEV_PM_OPS(clk_wzrd_dev_pm_ops, clk_wzrd_suspend, +static DEFINE_SIMPLE_DEV_PM_OPS(clk_wzrd_dev_pm_ops, clk_wzrd_suspend, clk_wzrd_resume);static const struct versal_clk_data versal_data = {
@@ -1242,7 +1242,7 @@ static struct platform_driver clk_wzrd_driver = { .driver = { .name = "clk-wizard", .of_match_table = clk_wzrd_ids, - .pm = &clk_wzrd_dev_pm_ops, + .pm = pm_sleep_ptr(&clk_wzrd_dev_pm_ops), }, .probe = clk_wzrd_probe, };
Signature · 1 line
2.53.0
[email protected]
AI reviewThank you for your contribution! Sashiko AI review found 2 potential issue(s) to consider:
Thank you for your contribution! Sashiko AI review found 2 potential issue(s) to consider:
Pre-existing issues:
- [High] Clock references obtained via of_clk_get_by_name() are leaked on the successful probe path.
- [Low] Missing named initializers for struct i2c_device_id array elements.
--
--- Patch [1]: [PATCH] drivers/clk: Convert to DEFINE_SIMPLE_DEV_PM_OPS() --- commit 905f2dc2a103be650ab5a8a95761cebf0202b40a
Author: Triet Hoang <[email protected]>
drivers/clk: Convert to DEFINE_SIMPLE_DEV_PM_OPS()
Convert the deprecated SIMPLE_DEV_PM_OPS to DEFINE_SIMPLE_DEV_PM_OPS and pm_sleep_ptr(). This lets us drop the maybe unused annotations from its suspend and resume callbacks, and reduces kernel size in case CONFIG_PM or CONFIG_PM_SLEEP is disabled.
Quoted 4 lines
drivers/clk/clk-si521xx.c +0
-0
[ ... ]
Quoted 5 lines
drivers/clk/clk-si521xx.c +0
-1@@ -379,12 +379,12 @@ static const struct of_device_id clk_si521xx_of_match[] = { };MODULE_DEVICE_TABLE (of, clk_si521xx_of_match); -static SIMPLE_DEV_PM_OPS(si521xx_pm_ops, si521xx_suspend, si521xx_resume);
drivers/clk/clk-si521xx.c static const struct of_device_id clk_si521xx_of_match[] = { · line 390
Quoted 10 lines
drivers/clk/clk-si521xx.c +2
-1+static DEFINE_SIMPLE_DEV_PM_OPS(si521xx_pm_ops, si521xx_suspend, si521xx_resume);static struct i2c_driver si521xx_driver = { .driver = { .name ="clk-si521xx" , - .pm = &si521xx_pm_ops, + .pm =pm_sleep_ptr (&si521xx_pm_ops), .of_match_table = clk_si521xx_of_match, }, .probe = si521xx_probe,
[Severity: Low]
This is a pre-existing issue, but I noticed the si521xx_id array assigned to the id_table near here uses a positional initializer for the i2c_device_id name field. Does the I2C subsystem require named initializers for i2c_device_id arrays?
Quoted 4 lines
drivers/clk/clk-versaclock5.c +0
-0
[ ... ]
Quoted 5 lines
drivers/clk/clk-versaclock5.c +0
-1@@ -1335,12 +1335,12 @@ static const struct of_device_id clk_vc5_of_match[] = { };MODULE_DEVICE_TABLE (of, clk_vc5_of_match); -static SIMPLE_DEV_PM_OPS(vc5_pm_ops, vc5_suspend, vc5_resume);
drivers/clk/clk-versaclock5.c static const struct of_device_id clk_vc5_of_match[] = { · line 1346
Quoted 10 lines
drivers/clk/clk-versaclock5.c +2
-1+static DEFINE_SIMPLE_DEV_PM_OPS(vc5_pm_ops, vc5_suspend, vc5_resume);static struct i2c_driver vc5_driver = { .driver = { .name ="vc5" , - .pm = &vc5_pm_ops, + .pm =pm_sleep_ptr (&vc5_pm_ops), .of_match_table = clk_vc5_of_match, }, .probe = vc5_probe,
[Severity: Low]
This is also a pre-existing issue, but similar to the si521xx driver, the vc5_id array uses a positional initializer. Should this be updated to use a named initializer to match I2C subsystem guidelines?
drivers/clk/samsung/clk-exynos-clkout.c static void exynos_clkout_remove(struct platform_device *pdev)
Quoted 5 lines
drivers/clk/samsung/clk-exynos-clkout.c +0
-0@@ -214,7 +214,7 @@ static void exynos_clkout_remove(struct platform_device *pdev)
[Severity: High]
This is a pre-existing issue, but looking at exynos_clkout_probe() right above this remove function, do we leak clock references on probe success?
It appears that exynos_clkout_probe() retrieves parent clock references using of_clk_get_by_name() and stores them in a local parents array. While clk_put() is correctly called in the err_clk_unreg path, the function returns 0 on success without dropping the references.
Could this permanently leak the references when the local array goes out of scope, preventing the provider modules from ever being unloaded?
Quoted 2 lines
drivers/clk/samsung/clk-exynos-clkout.c +0
-0iounmap (clkout->reg); }
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=1
Quoted 8 lines · Triet Hoang
Convert the deprecated
SIMPLE_DEV_PM_OPS
toDEFINE_SIMPLE_DEV_PM_OPSandpm_sleep_ptr().This lets us drop the
__maybe_unusedannotations from its suspend and resume callbacks, and reduces kernel size in caseCONFIG_PMorCONFIG_PM_SLEEPis disabled.Signed-off-by Triet Hoang <[email protected]>
Brian Masney
AppliedQuoted 1 line · Triet Hoang
drivers/clk: Convert toDEFINE_SIMPLE_DEV_PM_OPS()
Applied, thanks!
[1/1] drivers/clk: Convert to DEFINE_SIMPLE_DEV_PM_OPS()
commit: 48bec6fd8ec32ffdf65a5ccf268428a9f79ea210
Best regards,
Signature · 1 line
Brian Masney <[email protected]>