| Message ID | 20250109152055.52931-1-rgallaispou@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | e84a7da8c5d6675be203876fd51c3897aaaf207d |
| Headers | show |
| Series | [v2] usb: dwc3: st: Switch from CONFIG_PM_SLEEP guards to pm_sleep_ptr() | expand |
On Thu, Jan 09, 2025, Raphael Gallais-Pou wrote: > Letting the compiler remove these functions when the kernel is built > without CONFIG_PM_SLEEP support is simpler and less error prone than the > use of #ifdef based kernel configuration guards. > > Signed-off-by: Raphael Gallais-Pou <rgallaispou@gmail.com> > --- > Changes in v2: > - Split serie in single patches > - Remove irrelevant 'Link:' from commit log > - Link to v1: https://urldefense.com/v3/__https://lore.kernel.org/r/20241229-update_pm_macro-v1-1-c7d4c4856336@gmail.com__;!!A4F2R9G_pg!e8eD9plJTlBfv3F2PIKo9M_iJd5FS75w9XuozUEOxjdPYLk08Q0x78HpwPg-qAgYHmtAiHqIeHZEnN9JtJ2o0LK80Q$ > --- > drivers/usb/dwc3/dwc3-st.c | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > > diff --git a/drivers/usb/dwc3/dwc3-st.c b/drivers/usb/dwc3/dwc3-st.c > index e16c3237180e..ef7c43008946 100644 > --- a/drivers/usb/dwc3/dwc3-st.c > +++ b/drivers/usb/dwc3/dwc3-st.c > @@ -309,7 +309,6 @@ static void st_dwc3_remove(struct platform_device *pdev) > reset_control_assert(dwc3_data->rstc_rst); > } > > -#ifdef CONFIG_PM_SLEEP > static int st_dwc3_suspend(struct device *dev) > { > struct st_dwc3 *dwc3_data = dev_get_drvdata(dev); > @@ -343,9 +342,8 @@ static int st_dwc3_resume(struct device *dev) > > return 0; > } > -#endif /* CONFIG_PM_SLEEP */ > > -static SIMPLE_DEV_PM_OPS(st_dwc3_dev_pm_ops, st_dwc3_suspend, st_dwc3_resume); > +static DEFINE_SIMPLE_DEV_PM_OPS(st_dwc3_dev_pm_ops, st_dwc3_suspend, st_dwc3_resume); > > static const struct of_device_id st_dwc3_match[] = { > { .compatible = "st,stih407-dwc3" }, > @@ -360,7 +358,7 @@ static struct platform_driver st_dwc3_driver = { > .driver = { > .name = "usb-st-dwc3", > .of_match_table = st_dwc3_match, > - .pm = &st_dwc3_dev_pm_ops, > + .pm = pm_sleep_ptr(&st_dwc3_dev_pm_ops), > }, > }; > > -- > 2.47.1 > Acked-by: Thinh Nguyen <Thinh.Nguyen@synopsys.com> Thanks, Thinh
diff --git a/drivers/usb/dwc3/dwc3-st.c b/drivers/usb/dwc3/dwc3-st.c index e16c3237180e..ef7c43008946 100644 --- a/drivers/usb/dwc3/dwc3-st.c +++ b/drivers/usb/dwc3/dwc3-st.c @@ -309,7 +309,6 @@ static void st_dwc3_remove(struct platform_device *pdev) reset_control_assert(dwc3_data->rstc_rst); } -#ifdef CONFIG_PM_SLEEP static int st_dwc3_suspend(struct device *dev) { struct st_dwc3 *dwc3_data = dev_get_drvdata(dev); @@ -343,9 +342,8 @@ static int st_dwc3_resume(struct device *dev) return 0; } -#endif /* CONFIG_PM_SLEEP */ -static SIMPLE_DEV_PM_OPS(st_dwc3_dev_pm_ops, st_dwc3_suspend, st_dwc3_resume); +static DEFINE_SIMPLE_DEV_PM_OPS(st_dwc3_dev_pm_ops, st_dwc3_suspend, st_dwc3_resume); static const struct of_device_id st_dwc3_match[] = { { .compatible = "st,stih407-dwc3" }, @@ -360,7 +358,7 @@ static struct platform_driver st_dwc3_driver = { .driver = { .name = "usb-st-dwc3", .of_match_table = st_dwc3_match, - .pm = &st_dwc3_dev_pm_ops, + .pm = pm_sleep_ptr(&st_dwc3_dev_pm_ops), }, };
Letting the compiler remove these functions when the kernel is built without CONFIG_PM_SLEEP support is simpler and less error prone than the use of #ifdef based kernel configuration guards. Signed-off-by: Raphael Gallais-Pou <rgallaispou@gmail.com> --- Changes in v2: - Split serie in single patches - Remove irrelevant 'Link:' from commit log - Link to v1: https://lore.kernel.org/r/20241229-update_pm_macro-v1-1-c7d4c4856336@gmail.com --- drivers/usb/dwc3/dwc3-st.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)