clocksource: ingenic-ost: define pm functions properly in platform_driver struct
Subsystems (2)
PATCH v2 1/1 clocksource: ingenic-ost: define pm functions properly in platform_driver struct
Commit ca7b72b5a5f2 ("clocksource: Add driver for the Ingenic JZ47xx OST") adds the struct platform_driver ingenic_ost_driver, with the definition of pm functions under the non-existing config PM_SUSPEND, which means the intended pm functions were never actually included in any build.
As the only callbacks are .suspend_noirq and .resume_noirq, we can assume that it is intended to be CONFIG_PM_SLEEP.
Since commit 1a3c7bb08826 ("PM: core: Add new *_PM_OPS macros, deprecate old ones"), the default pattern for platform_driver definitions conditional for CONFIG_PM_SLEEP is to use pm_sleep_ptr().
As __maybe_unused annotations on the dev_pm_ops structure and its callbacks are not needed anymore, remove these as well.
---
v1: https://lore.kernel.org/all/[email protected]/
v1 -> v2:
- incorporated Paul Cercueil's feedback:
- changed to pm_sleep_ptr
- dropped Fixes: tag
drivers/clocksource/ingenic-ost.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)
drivers/clocksource/ingenic-ost.c +4 -6
@@ -141,7 +141,7 @@ static int __init ingenic_ost_probe(struct platform_device *pdev)return 0 ; } -static int __maybe_unused ingenic_ost_suspend (struct device *dev) +static int ingenic_ost_suspend (struct device *dev) {struct ingenic_ost *ost =dev_get_drvdata (dev);
@@ -150,14 +150,14 @@ static int __maybe_unused ingenic_ost_suspend(struct device *dev)return 0 ; } -static int __maybe_unused ingenic_ost_resume (struct device *dev) +static int ingenic_ost_resume (struct device *dev) {struct ingenic_ost *ost =dev_get_drvdata (dev);return clk_enable (ost->clk); } -static const struct dev_pm_ops __maybe_unused ingenic_ost_pm_ops = { +static const struct dev_pm_ops ingenic_ost_pm_ops = {/* _noirq: We want the OST clock to be gated last / ungated first */ .suspend_noirq = ingenic_ost_suspend, .resume_noirq = ingenic_ost_resume,
@@ -181,9 +181,7 @@ static const struct of_device_id ingenic_ost_of_match[] = {static struct platform_driver ingenic_ost_driver = { .driver = { .name ="ingenic-ost" , -#ifdef CONFIG_PM_SUSPEND - .pm = &ingenic_ost_pm_ops, -#endif + .pm =pm_sleep_ptr (&ingenic_ost_pm_ops), .of_match_table = ingenic_ost_of_match, }, };
Signature · 1 line
2.17.1
Hi Lukas,
Quoted 12 lines · Lukas Bulwahn
Commit
ca7b72b5a5f2("clocksource: Add driver for the Ingenic JZ47xx OST") adds the structplatform_driveringenic_ost_driver, with the definition of pm functions under the non-existing configPM_SUSPEND, which means the intended pm functions were never actually included in any build.As the only callbacks are .suspend_noirq and .resume_noirq, we can assume that it is intended to be
CONFIG_PM_SLEEP.Since commit
1a3c7bb08826("PM: core: Add new*_PM_OPSmacros, deprecate old ones"), the default pattern forplatform_driverdefinitions conditional forCONFIG_PM_SLEEPis to usepm_sleep_ptr().
Quoted 5 lines
As
__maybe_unusedannotations on thedev_pm_opsstructure and its callbacks are not needed anymore, remove these as well.Suggested-by Paul Cercueil <[email protected]>Signed-off-by Lukas Bulwahn <[email protected]>
Cheers,
-Paul
Quoted 58 lines
---
v1: https://lore.kernel.org/all/[email protected]/v1 -> v2:
- incorporated Paul Cercueil's feedback:
- changed topm_sleep_ptr
- dropped Fixes: tagdrivers/clocksource/ingenic-ost.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)drivers/clocksource/ingenic-ost.c +3
-3@@ -141,7 +141,7 @@ static int __init ingenic_ost_probe(struct platform_device *pdev)return 0 ; } -static int __maybe_unused ingenic_ost_suspend (struct device *dev) +static int ingenic_ost_suspend (struct device *dev) {struct ingenic_ost *ost =dev_get_drvdata (dev);@@ -150,14 +150,14 @@ static int __maybe_unused ingenic_ost_suspend(struct device *dev) return 0; } -static int __maybe_unused ingenic_ost_resume (struct device *dev) +static int ingenic_ost_resume (struct device *dev) {struct ingenic_ost *ost =dev_get_drvdata (dev);return clk_enable (ost->clk); } -static const struct dev_pm_ops __maybe_unused ingenic_ost_pm_ops = { +static const struct dev_pm_ops ingenic_ost_pm_ops = {/* _noirq: We want the OST clock to be gated last / ungated first */ .suspend_noirq = ingenic_ost_suspend,drivers/clocksource/ingenic-ost.c +1
-3.resume_noirq = ingenic_ost_resume,@@ -181,9 +181,7 @@ static const struct of_device_id ingenic_ost_of_match[] = {static struct platform_driver ingenic_ost_driver = { .driver = { .name ="ingenic-ost" , -#ifdef CONFIG_PM_SUSPEND - .pm = &ingenic_ost_pm_ops, -#endif + .pm =pm_sleep_ptr (&ingenic_ost_pm_ops), .of_match_table = ingenic_ost_of_match, },};
--
2.17.1
Lukas!
Quoted 12 lines · Lukas Bulwahn
Commit
ca7b72b5a5f2("clocksource: Add driver for the Ingenic JZ47xx OST") adds the structplatform_driveringenic_ost_driver, with the definition of pm functions under the non-existing configPM_SUSPEND, which means the intended pm functions were never actually included in any build.As the only callbacks are .suspend_noirq and .resume_noirq, we can assume that it is intended to be
CONFIG_PM_SLEEP.Since commit
1a3c7bb08826("PM: core: Add new*_PM_OPSmacros, deprecate old ones"), the default pattern forplatform_driverdefinitions conditional forCONFIG_PM_SLEEPis to usepm_sleep_ptr().
Quoted 5 lines
As
__maybe_unusedannotations on thedev_pm_opsstructure and its callbacks are not needed anymore, remove these as well.Suggested-by Paul Cercueil <[email protected]>Signed-off-by Lukas Bulwahn <[email protected]>
just a minor nit. The subsystem prefix should be:
clocksource/drivers/ingenic-ost:
git log --one-line $FILE is usually a good hint for the subsystem specific prefix choice.
Fixed it up while applying.
Thanks,
tglx
[tip: timers/core] clocksource/drivers/ingenic-ost: Define pm functions properly in platform_driver struct
In reply to Lukas BulwahnThe following commit has been merged into the timers/core branch of tip:
The following commit has been merged into the timers/core branch of tip:
Commit-ID: 035629547999d0e9095886f248c2580dc56f36c6 Gitweb: https://git.kernel.org/tip/035629547999d0e9095886f248c2580dc56f36c6 Author: Lukas Bulwahn <[email protected]> AuthorDate: Wed, 23 Nov 2022 09:31:59 +01:00 Committer: Thomas Gleixner <[email protected]> CommitterDate: Thu, 01 Dec 2022 11:56:36 +01:00
clocksource/drivers/ingenic-ost: Define pm functions properly in platform_driver struct
Commit ca7b72b5a5f2 ("clocksource: Add driver for the Ingenic JZ47xx OST") adds the struct platform_driver ingenic_ost_driver, with the definition of pm functions under the non-existing config PM_SUSPEND, which means the intended pm functions were never actually included in any build.
As the only callbacks are .suspend_noirq and .resume_noirq, we can assume that it is intended to be CONFIG_PM_SLEEP.
Since commit 1a3c7bb08826 ("PM: core: Add new *_PM_OPS macros, deprecate old ones"), the default pattern for platform_driver definitions conditional for CONFIG_PM_SLEEP is to use pm_sleep_ptr().
As __maybe_unused annotations on the dev_pm_ops structure and its callbacks are not needed anymore, remove these as well.
--- drivers/clocksource/ingenic-ost.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)
drivers/clocksource/ingenic-ost.c +4 -6
@@ -141,7 +141,7 @@ static int __init ingenic_ost_probe(struct platform_device *pdev)return 0 ; } -static int __maybe_unused ingenic_ost_suspend (struct device *dev) +static int ingenic_ost_suspend (struct device *dev) {struct ingenic_ost *ost =dev_get_drvdata (dev);
@@ -150,14 +150,14 @@ static int __maybe_unused ingenic_ost_suspend(struct device *dev)return 0 ; } -static int __maybe_unused ingenic_ost_resume (struct device *dev) +static int ingenic_ost_resume (struct device *dev) {struct ingenic_ost *ost =dev_get_drvdata (dev);return clk_enable (ost->clk); } -static const struct dev_pm_ops __maybe_unused ingenic_ost_pm_ops = { +static const struct dev_pm_ops ingenic_ost_pm_ops = {/* _noirq: We want the OST clock to be gated last / ungated first */ .suspend_noirq = ingenic_ost_suspend, .resume_noirq = ingenic_ost_resume,
@@ -181,9 +181,7 @@ static const struct of_device_id ingenic_ost_of_match[] = {static struct platform_driver ingenic_ost_driver = { .driver = { .name ="ingenic-ost" , -#ifdef CONFIG_PM_SUSPEND - .pm = &ingenic_ost_pm_ops, -#endif + .pm =pm_sleep_ptr (&ingenic_ost_pm_ops), .of_match_table = ingenic_ost_of_match, }, };