* [PATCH 1/2] usb: chipidea: ci_hdrc_imx: Switch to RUNTIME/SYSTEM_SLEEP_PM_OPS()
@ 2024-06-25 23:10 Fabio Estevam
2024-06-25 23:10 ` [PATCH 2/2] usb: chipidea: ci_hdrc_tegra: Switch to RUNTIME_PM_OPS() Fabio Estevam
2024-07-10 1:51 ` [PATCH 1/2] usb: chipidea: ci_hdrc_imx: Switch to RUNTIME/SYSTEM_SLEEP_PM_OPS() Peter Chen
0 siblings, 2 replies; 4+ messages in thread
From: Fabio Estevam @ 2024-06-25 23:10 UTC (permalink / raw)
To: gregkh; +Cc: peter.chen, thierry.reding, linux-usb, Fabio Estevam
From: Fabio Estevam <festevam@denx.de>
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.
Signed-off-by: Fabio Estevam <festevam@denx.de>
---
drivers/usb/chipidea/ci_hdrc_imx.c | 19 +++++++++----------
1 file changed, 9 insertions(+), 10 deletions(-)
diff --git a/drivers/usb/chipidea/ci_hdrc_imx.c b/drivers/usb/chipidea/ci_hdrc_imx.c
index a17b6d619305..bdc04ce919f7 100644
--- a/drivers/usb/chipidea/ci_hdrc_imx.c
+++ b/drivers/usb/chipidea/ci_hdrc_imx.c
@@ -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),
},
};
--
2.34.1
^ permalink raw reply related [flat|nested] 4+ messages in thread* [PATCH 2/2] usb: chipidea: ci_hdrc_tegra: Switch to RUNTIME_PM_OPS()
2024-06-25 23:10 [PATCH 1/2] usb: chipidea: ci_hdrc_imx: Switch to RUNTIME/SYSTEM_SLEEP_PM_OPS() Fabio Estevam
@ 2024-06-25 23:10 ` Fabio Estevam
2024-07-10 1:51 ` Peter Chen
2024-07-10 1:51 ` [PATCH 1/2] usb: chipidea: ci_hdrc_imx: Switch to RUNTIME/SYSTEM_SLEEP_PM_OPS() Peter Chen
1 sibling, 1 reply; 4+ messages in thread
From: Fabio Estevam @ 2024-06-25 23:10 UTC (permalink / raw)
To: gregkh; +Cc: peter.chen, thierry.reding, linux-usb, Fabio Estevam
From: Fabio Estevam <festevam@denx.de>
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.
Signed-off-by: Fabio Estevam <festevam@denx.de>
---
drivers/usb/chipidea/ci_hdrc_tegra.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/drivers/usb/chipidea/ci_hdrc_tegra.c b/drivers/usb/chipidea/ci_hdrc_tegra.c
index 2cc305803217..9538d425f0a0 100644
--- a/drivers/usb/chipidea/ci_hdrc_tegra.c
+++ b/drivers/usb/chipidea/ci_hdrc_tegra.c
@@ -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,
--
2.34.1
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH 2/2] usb: chipidea: ci_hdrc_tegra: Switch to RUNTIME_PM_OPS()
2024-06-25 23:10 ` [PATCH 2/2] usb: chipidea: ci_hdrc_tegra: Switch to RUNTIME_PM_OPS() Fabio Estevam
@ 2024-07-10 1:51 ` Peter Chen
0 siblings, 0 replies; 4+ messages in thread
From: Peter Chen @ 2024-07-10 1:51 UTC (permalink / raw)
To: Fabio Estevam; +Cc: gregkh, thierry.reding, linux-usb, Fabio Estevam
On 24-06-25 20:10:23, Fabio Estevam wrote:
> From: Fabio Estevam <festevam@denx.de>
>
> 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.
>
> Signed-off-by: Fabio Estevam <festevam@denx.de>
Acked-by: Peter Chen <peter.chen@kernel.org>
> ---
> drivers/usb/chipidea/ci_hdrc_tegra.c | 9 ++++-----
> 1 file changed, 4 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/usb/chipidea/ci_hdrc_tegra.c b/drivers/usb/chipidea/ci_hdrc_tegra.c
> index 2cc305803217..9538d425f0a0 100644
> --- a/drivers/usb/chipidea/ci_hdrc_tegra.c
> +++ b/drivers/usb/chipidea/ci_hdrc_tegra.c
> @@ -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,
> --
> 2.34.1
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 1/2] usb: chipidea: ci_hdrc_imx: Switch to RUNTIME/SYSTEM_SLEEP_PM_OPS()
2024-06-25 23:10 [PATCH 1/2] usb: chipidea: ci_hdrc_imx: Switch to RUNTIME/SYSTEM_SLEEP_PM_OPS() Fabio Estevam
2024-06-25 23:10 ` [PATCH 2/2] usb: chipidea: ci_hdrc_tegra: Switch to RUNTIME_PM_OPS() Fabio Estevam
@ 2024-07-10 1:51 ` Peter Chen
1 sibling, 0 replies; 4+ messages in thread
From: Peter Chen @ 2024-07-10 1:51 UTC (permalink / raw)
To: Fabio Estevam; +Cc: gregkh, thierry.reding, linux-usb, Fabio Estevam
On 24-06-25 20:10:22, Fabio Estevam wrote:
> From: Fabio Estevam <festevam@denx.de>
>
> 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.
>
> Signed-off-by: Fabio Estevam <festevam@denx.de>
Acked-by: Peter Chen <peter.chen@kernel.org>
> ---
> drivers/usb/chipidea/ci_hdrc_imx.c | 19 +++++++++----------
> 1 file changed, 9 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/usb/chipidea/ci_hdrc_imx.c b/drivers/usb/chipidea/ci_hdrc_imx.c
> index a17b6d619305..bdc04ce919f7 100644
> --- a/drivers/usb/chipidea/ci_hdrc_imx.c
> +++ b/drivers/usb/chipidea/ci_hdrc_imx.c
> @@ -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),
> },
> };
>
> --
> 2.34.1
>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-07-10 1:52 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-06-25 23:10 [PATCH 1/2] usb: chipidea: ci_hdrc_imx: Switch to RUNTIME/SYSTEM_SLEEP_PM_OPS() Fabio Estevam
2024-06-25 23:10 ` [PATCH 2/2] usb: chipidea: ci_hdrc_tegra: Switch to RUNTIME_PM_OPS() Fabio Estevam
2024-07-10 1:51 ` Peter Chen
2024-07-10 1:51 ` [PATCH 1/2] usb: chipidea: ci_hdrc_imx: Switch to RUNTIME/SYSTEM_SLEEP_PM_OPS() Peter Chen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox