2024-04-12 14:29:08

by Anand Moon

Subject: [PATCH v3 5/5] usb: dwc3: exynos: Use DEFINE_SIMPLE_DEV_PM_OPS for PM functions

This macro has the advantage over SIMPLE_DEV_PM_OPS that we don't have to
care about when the functions are actually used.

Also make use of pm_sleep_ptr() to discard all PM_SLEEP related
stuff if CONFIG_PM_SLEEP isn't enabled.

Signed-off-by: Anand Moon <[email protected]>
---
v3: fix using new DEFINE_SIMPLE_DEV_PM_OPS PM macro hence
change the $subject and the commit message

v2: add __maybe_unused to suspend/resume functions in case CONFIG_PM
is disabled.
---
drivers/usb/dwc3/dwc3-exynos.c | 13 +++----------
1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/drivers/usb/dwc3/dwc3-exynos.c b/drivers/usb/dwc3/dwc3-exynos.c
index 5d365ca51771..3427522a7c6a 100644
--- a/drivers/usb/dwc3/dwc3-exynos.c
+++ b/drivers/usb/dwc3/dwc3-exynos.c
@@ -187,7 +187,6 @@ static const struct of_device_id exynos_dwc3_match[] = {
};
MODULE_DEVICE_TABLE(of, exynos_dwc3_match);

-#ifdef CONFIG_PM_SLEEP
static int dwc3_exynos_suspend(struct device *dev)
{
struct dwc3_exynos *exynos = dev_get_drvdata(dev);
@@ -230,14 +229,8 @@ static int dwc3_exynos_resume(struct device *dev)
return 0;
}

-static const struct dev_pm_ops dwc3_exynos_dev_pm_ops = {
- SET_SYSTEM_SLEEP_PM_OPS(dwc3_exynos_suspend, dwc3_exynos_resume)
-};
-
-#define DEV_PM_OPS (&dwc3_exynos_dev_pm_ops)
-#else
-#define DEV_PM_OPS NULL
-#endif /* CONFIG_PM_SLEEP */
+static DEFINE_SIMPLE_DEV_PM_OPS(dwc3_exynos_dev_pm_ops,
+ dwc3_exynos_suspend, dwc3_exynos_resume);

static struct platform_driver dwc3_exynos_driver = {
.probe = dwc3_exynos_probe,
@@ -245,7 +238,7 @@ static struct platform_driver dwc3_exynos_driver = {
.driver = {
.name = "exynos-dwc3",
.of_match_table = exynos_dwc3_match,
- .pm = DEV_PM_OPS,
+ .pm = pm_sleep_ptr(&dwc3_exynos_dev_pm_ops),
},
};

--
2.44.0

2024-04-16 00:44:41

by Thinh Nguyen

Subject: Re: [PATCH v3 5/5] usb: dwc3: exynos: Use DEFINE_SIMPLE_DEV_PM_OPS for PM functions

On Fri, Apr 12, 2024, Anand Moon wrote:
> This macro has the advantage over SIMPLE_DEV_PM_OPS that we don't have to
> care about when the functions are actually used.
>
> Also make use of pm_sleep_ptr() to discard all PM_SLEEP related
> stuff if CONFIG_PM_SLEEP isn't enabled.
>
> Signed-off-by: Anand Moon <[email protected]>
> ---
> v3: fix using new DEFINE_SIMPLE_DEV_PM_OPS PM macro hence
> change the $subject and the commit message
>
> v2: add __maybe_unused to suspend/resume functions in case CONFIG_PM
> is disabled.
> ---
> drivers/usb/dwc3/dwc3-exynos.c | 13 +++----------
> 1 file changed, 3 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/usb/dwc3/dwc3-exynos.c b/drivers/usb/dwc3/dwc3-exynos.c
> index 5d365ca51771..3427522a7c6a 100644
> --- a/drivers/usb/dwc3/dwc3-exynos.c
> +++ b/drivers/usb/dwc3/dwc3-exynos.c
> @@ -187,7 +187,6 @@ static const struct of_device_id exynos_dwc3_match[] = {
> };
> MODULE_DEVICE_TABLE(of, exynos_dwc3_match);
>
> -#ifdef CONFIG_PM_SLEEP
> static int dwc3_exynos_suspend(struct device *dev)
> {
> struct dwc3_exynos *exynos = dev_get_drvdata(dev);
> @@ -230,14 +229,8 @@ static int dwc3_exynos_resume(struct device *dev)
> return 0;
> }
>
> -static const struct dev_pm_ops dwc3_exynos_dev_pm_ops = {
> - SET_SYSTEM_SLEEP_PM_OPS(dwc3_exynos_suspend, dwc3_exynos_resume)
> -};
> -
> -#define DEV_PM_OPS (&dwc3_exynos_dev_pm_ops)
> -#else
> -#define DEV_PM_OPS NULL
> -#endif /* CONFIG_PM_SLEEP */
> +static DEFINE_SIMPLE_DEV_PM_OPS(dwc3_exynos_dev_pm_ops,
> + dwc3_exynos_suspend, dwc3_exynos_resume);
>
> static struct platform_driver dwc3_exynos_driver = {
> .probe = dwc3_exynos_probe,
> @@ -245,7 +238,7 @@ static struct platform_driver dwc3_exynos_driver = {
> .driver = {
> .name = "exynos-dwc3",
> .of_match_table = exynos_dwc3_match,
> - .pm = DEV_PM_OPS,
> + .pm = pm_sleep_ptr(&dwc3_exynos_dev_pm_ops),
> },
> };
>
> --
> 2.44.0
>

Acked-by: Thinh Nguyen <[email protected]>

Thanks,
Thinh