usb: chipidea: ci_hdrc_imx: Switch to RUNTIME/SYSTEM_SLEEP_PM_OPS()
Subsystems (4)
Fabio Estevam
reviewerPATCH 1/2 usb: chipidea: ci_hdrc_imx: Switch to RUNTIME/SYSTEM_SLEEP_PM_OPS()
From: Fabio Estevam <[email protected]>
Replace SET_RUNTIME_PM_OPS()/SET SYSTEM_SLEEP_PM_OPS() with their modern RUNTIME_PM_OPS() and SYSTEM_SLEEP_PM_OPS() alternatives.
The combined usage of pm_ptr() and RUNTIME_PM_OPS/SYSTEM_SLEEP_PM_OPS() allows the compiler to evaluate if the runtime suspend/resume() functions are used at build time or are simply dead code.
This allows removing the __maybe_unused notation from the runtime suspend/resume() functions.
--- drivers/usb/chipidea/ci_hdrc_imx.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-)
drivers/usb/chipidea/ci_hdrc_imx.c +9 -10
@@ -557,7 +557,7 @@ static void ci_hdrc_imx_shutdown(struct platform_device *pdev)ci_hdrc_imx_remove (pdev); } -static int __maybe_unused imx_controller_suspend (struct device *dev, +static int imx_controller_suspend (struct device *dev,pm_message_t msg) {struct ci_hdrc_imx_data *data =dev_get_drvdata (dev);
@@ -582,7 +582,7 @@ static int __maybe_unused imx_controller_suspend(struct device *dev,return 0 ; } -static int __maybe_unused imx_controller_resume (struct device *dev, +static int imx_controller_resume (struct device *dev,pm_message_t msg) {struct ci_hdrc_imx_data *data =dev_get_drvdata (dev);
@@ -618,7 +618,7 @@ static int __maybe_unused imx_controller_resume(struct device *dev,return ret; } -static int __maybe_unused ci_hdrc_imx_suspend (struct device *dev) +static int ci_hdrc_imx_suspend (struct device *dev) {int ret;
@@ -636,7 +636,7 @@ static int __maybe_unused ci_hdrc_imx_suspend(struct device *dev)return ret; } -static int __maybe_unused ci_hdrc_imx_resume (struct device *dev) +static int ci_hdrc_imx_resume (struct device *dev) {struct ci_hdrc_imx_data *data =dev_get_drvdata (dev);int ret;
@@ -652,7 +652,7 @@ static int __maybe_unused ci_hdrc_imx_resume(struct device *dev)return ret; } -static int __maybe_unused ci_hdrc_imx_runtime_suspend (struct device *dev) +static int ci_hdrc_imx_runtime_suspend (struct device *dev) {struct ci_hdrc_imx_data *data =dev_get_drvdata (dev);
@@ -664,15 +664,14 @@ static int __maybe_unused ci_hdrc_imx_runtime_suspend(struct device *dev)return imx_controller_suspend (dev,PMSG_AUTO_SUSPEND ); } -static int __maybe_unused ci_hdrc_imx_runtime_resume (struct device *dev) +static int ci_hdrc_imx_runtime_resume (struct device *dev) {return imx_controller_resume (dev,PMSG_AUTO_RESUME ); }static const struct dev_pm_ops ci_hdrc_imx_pm_ops = { - SET_SYSTEM_SLEEP_PM_OPS(ci_hdrc_imx_suspend, ci_hdrc_imx_resume) -SET_RUNTIME_PM_OPS (ci_hdrc_imx_runtime_suspend, - ci_hdrc_imx_runtime_resume,NULL ) + SYSTEM_SLEEP_PM_OPS(ci_hdrc_imx_suspend, ci_hdrc_imx_resume) +RUNTIME_PM_OPS (ci_hdrc_imx_runtime_suspend, ci_hdrc_imx_runtime_resume,NULL ) };static struct platform_driver ci_hdrc_imx_driver = { .probe = ci_hdrc_imx_probe,
@@ -681,7 +680,7 @@ static struct platform_driver ci_hdrc_imx_driver = { .driver = { .name = "imx_usb", .of_match_table = ci_hdrc_imx_dt_ids, - .pm = &ci_hdrc_imx_pm_ops, + .pm = pm_ptr(&ci_hdrc_imx_pm_ops), }, };
Signature · 1 line
2.34.1
Fabio Estevam
reviewerPATCH 2/2 usb: chipidea: ci_hdrc_tegra: Switch to RUNTIME_PM_OPS()
From: Fabio Estevam <[email protected]>
Replace SET_RUNTIME_PM_OPS() with its modern RUNTIME_PM_OPS() alternative.
The combined usage of pm_ptr() and RUNTIME_PM_OPS allows the compiler to evaluate if the runtime suspend/resume() functions are used at build time or are simply dead code.
This allows removing the __maybe_unused notation from the runtime suspend/resume() functions.
--- drivers/usb/chipidea/ci_hdrc_tegra.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)
drivers/usb/chipidea/ci_hdrc_tegra.c +4 -5
@@ -372,7 +372,7 @@ static void tegra_usb_remove(struct platform_device *pdev)pm_runtime_force_suspend (&pdev->dev); } -static int __maybe_unused tegra_usb_runtime_resume (struct device *dev) +static int tegra_usb_runtime_resume (struct device *dev) {struct tegra_usb *usb =dev_get_drvdata (dev);int err;
@@ -386,7 +386,7 @@ static int __maybe_unused tegra_usb_runtime_resume(struct device *dev)return 0 ; } -static int __maybe_unused tegra_usb_runtime_suspend (struct device *dev) +static int tegra_usb_runtime_suspend (struct device *dev) {struct tegra_usb *usb =dev_get_drvdata (dev);
@@ -396,15 +396,14 @@ static int __maybe_unused tegra_usb_runtime_suspend(struct device *dev) }static const struct dev_pm_ops tegra_usb_pm = { -SET_RUNTIME_PM_OPS (tegra_usb_runtime_suspend, tegra_usb_runtime_resume, -NULL ) +RUNTIME_PM_OPS (tegra_usb_runtime_suspend, tegra_usb_runtime_resume,NULL ) };static struct platform_driver tegra_usb_driver = { .driver = { .name ="tegra-usb" , .of_match_table = tegra_usb_of_match, - .pm = &tegra_usb_pm, + .pm =pm_ptr (&tegra_usb_pm), }, .probe = tegra_usb_probe, .remove_new = tegra_usb_remove,
Signature · 1 line
2.34.1
Re: [PATCH 2/2] usb: chipidea: ci_hdrc_tegra: Switch to RUNTIME_PM_OPS()
Quoted 5 lines · Fabio Estevam
From: Fabio Estevam <[email protected]>
Replace
SET_RUNTIME_PM_OPS()with its modernRUNTIME_PM_OPS()alternative.
Quoted 8 lines
The combined usage of
pm_ptr()andRUNTIME_PM_OPSallows the compiler to evaluate if the runtime suspend/resume() functions are used at build time or are simply dead code.This allows removing the
__maybe_unusednotation from the runtime suspend/resume() functions.Signed-off-by Fabio Estevam <[email protected]>
Quoted 47 lines
--- drivers/usb/chipidea/ci_hdrc_tegra.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)drivers/usb/chipidea/ci_hdrc_tegra.c +4
-5@@ -372,7 +372,7 @@ static void tegra_usb_remove(struct platform_device *pdev)pm_runtime_force_suspend (&pdev->dev); } -static int __maybe_unused tegra_usb_runtime_resume (struct device *dev) +static int tegra_usb_runtime_resume (struct device *dev) {struct tegra_usb *usb =dev_get_drvdata (dev);int err;@@ -386,7 +386,7 @@ static int __maybe_unused tegra_usb_runtime_resume(struct device *dev)return 0 ; } -static int __maybe_unused tegra_usb_runtime_suspend (struct device *dev) +static int tegra_usb_runtime_suspend (struct device *dev) {struct tegra_usb *usb =dev_get_drvdata (dev);@@ -396,15 +396,14 @@ static int __maybe_unused tegra_usb_runtime_suspend(struct device *dev) }static const struct dev_pm_ops tegra_usb_pm = { -SET_RUNTIME_PM_OPS (tegra_usb_runtime_suspend, tegra_usb_runtime_resume, -NULL ) +RUNTIME_PM_OPS (tegra_usb_runtime_suspend, tegra_usb_runtime_resume,NULL ) };static struct platform_driver tegra_usb_driver = { .driver = { .name ="tegra-usb" , .of_match_table = tegra_usb_of_match, - .pm = &tegra_usb_pm, + .pm =pm_ptr (&tegra_usb_pm), }, .probe = tegra_usb_probe, .remove_new = tegra_usb_remove,Signature · 1 line
2.34.1
Quoted 5 lines · Fabio Estevam
From: Fabio Estevam <[email protected]>
Replace SET_RUNTIME_PM_OPS()/SET
SYSTEM_SLEEP_PM_OPS()with their modernRUNTIME_PM_OPS()andSYSTEM_SLEEP_PM_OPS()alternatives.
Quoted 8 lines
The combined usage of
pm_ptr()and RUNTIME_PM_OPS/SYSTEM_SLEEP_PM_OPS() allows the compiler to evaluate if the runtime suspend/resume() functions are used at build time or are simply dead code.This allows removing the
__maybe_unusednotation from the runtime suspend/resume() functions.Signed-off-by Fabio Estevam <[email protected]>
Quoted 84 lines
--- drivers/usb/chipidea/ci_hdrc_imx.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-)drivers/usb/chipidea/ci_hdrc_imx.c +9
-10@@ -557,7 +557,7 @@ static void ci_hdrc_imx_shutdown(struct platform_device *pdev)ci_hdrc_imx_remove (pdev); } -static int __maybe_unused imx_controller_suspend (struct device *dev, +static int imx_controller_suspend (struct device *dev,pm_message_t msg) {struct ci_hdrc_imx_data *data =dev_get_drvdata (dev);@@ -582,7 +582,7 @@ static int __maybe_unused imx_controller_suspend(struct device *dev,return 0 ; } -static int __maybe_unused imx_controller_resume (struct device *dev, +static int imx_controller_resume (struct device *dev,pm_message_t msg) {struct ci_hdrc_imx_data *data =dev_get_drvdata (dev);@@ -618,7 +618,7 @@ static int __maybe_unused imx_controller_resume(struct device *dev,return ret; } -static int __maybe_unused ci_hdrc_imx_suspend (struct device *dev) +static int ci_hdrc_imx_suspend (struct device *dev) {int ret;@@ -636,7 +636,7 @@ static int __maybe_unused ci_hdrc_imx_suspend(struct device *dev)return ret; } -static int __maybe_unused ci_hdrc_imx_resume (struct device *dev) +static int ci_hdrc_imx_resume (struct device *dev) {struct ci_hdrc_imx_data *data =dev_get_drvdata (dev);int ret;@@ -652,7 +652,7 @@ static int __maybe_unused ci_hdrc_imx_resume(struct device *dev)return ret; } -static int __maybe_unused ci_hdrc_imx_runtime_suspend (struct device *dev) +static int ci_hdrc_imx_runtime_suspend (struct device *dev) {struct ci_hdrc_imx_data *data =dev_get_drvdata (dev);@@ -664,15 +664,14 @@ static int __maybe_unused ci_hdrc_imx_runtime_suspend(struct device *dev)return imx_controller_suspend (dev,PMSG_AUTO_SUSPEND ); } -static int __maybe_unused ci_hdrc_imx_runtime_resume (struct device *dev) +static int ci_hdrc_imx_runtime_resume (struct device *dev) {return imx_controller_resume (dev,PMSG_AUTO_RESUME ); }static const struct dev_pm_ops ci_hdrc_imx_pm_ops = { - SET_SYSTEM_SLEEP_PM_OPS(ci_hdrc_imx_suspend, ci_hdrc_imx_resume) -SET_RUNTIME_PM_OPS (ci_hdrc_imx_runtime_suspend, - ci_hdrc_imx_runtime_resume,NULL ) + SYSTEM_SLEEP_PM_OPS(ci_hdrc_imx_suspend, ci_hdrc_imx_resume) +RUNTIME_PM_OPS (ci_hdrc_imx_runtime_suspend, ci_hdrc_imx_runtime_resume,NULL ) };static struct platform_driver ci_hdrc_imx_driver = { .probe = ci_hdrc_imx_probe,@@ -681,7 +680,7 @@ static struct platform_driver ci_hdrc_imx_driver = { .driver = { .name = "imx_usb", .of_match_table = ci_hdrc_imx_dt_ids, - .pm = &ci_hdrc_imx_pm_ops, + .pm = pm_ptr(&ci_hdrc_imx_pm_ops), }, };Signature · 1 line
2.34.1