| Message ID | 20240404071350.4242-5-linux.amoon@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | [v2,1/6] usb: ehci-exynos: Use devm_clk_get_enabled() helpers | expand |
On Thu, Apr 04, 2024 at 12:43:20PM +0530, Anand Moon wrote: > Use the new PM macros for the suspend and resume functions to be > automatically dropped by the compiler when CONFIG_PM are disabled, > without having to use #ifdef guards. If CONFIG_PM unused, > they will simply be discarded by the compiler. > > Signed-off-by: Anand Moon <linux.amoon@gmail.com> > --- > v2: new changes in this series. > --- Acked-by: Alan Stern <stern@rowland.harvard.edu> > drivers/usb/host/ohci-exynos.c | 11 +++-------- > 1 file changed, 3 insertions(+), 8 deletions(-) > > diff --git a/drivers/usb/host/ohci-exynos.c b/drivers/usb/host/ohci-exynos.c > index 85d04ae0ae40..3e647e0b341d 100644 > --- a/drivers/usb/host/ohci-exynos.c > +++ b/drivers/usb/host/ohci-exynos.c > @@ -212,8 +212,7 @@ static void exynos_ohci_shutdown(struct platform_device *pdev) > hcd->driver->shutdown(hcd); > } > > -#ifdef CONFIG_PM > -static int exynos_ohci_suspend(struct device *dev) > +static int __maybe_unused exynos_ohci_suspend(struct device *dev) > { > struct usb_hcd *hcd = dev_get_drvdata(dev); > struct exynos_ohci_hcd *exynos_ohci = to_exynos_ohci(hcd); > @@ -230,7 +229,7 @@ static int exynos_ohci_suspend(struct device *dev) > return 0; > } > > -static int exynos_ohci_resume(struct device *dev) > +static int __maybe_unused exynos_ohci_resume(struct device *dev) > { > struct usb_hcd *hcd = dev_get_drvdata(dev); > struct exynos_ohci_hcd *exynos_ohci = to_exynos_ohci(hcd); > @@ -249,10 +248,6 @@ static int exynos_ohci_resume(struct device *dev) > > return 0; > } > -#else > -#define exynos_ohci_suspend NULL > -#define exynos_ohci_resume NULL > -#endif > > static const struct ohci_driver_overrides exynos_overrides __initconst = { > .extra_priv_size = sizeof(struct exynos_ohci_hcd), > @@ -277,7 +272,7 @@ static struct platform_driver exynos_ohci_driver = { > .shutdown = exynos_ohci_shutdown, > .driver = { > .name = "exynos-ohci", > - .pm = &exynos_ohci_pm_ops, > + .pm = pm_ptr(&exynos_ohci_pm_ops), > .of_match_table = of_match_ptr(exynos_ohci_match), > } > }; > -- > 2.44.0 >
diff --git a/drivers/usb/host/ohci-exynos.c b/drivers/usb/host/ohci-exynos.c index 85d04ae0ae40..3e647e0b341d 100644 --- a/drivers/usb/host/ohci-exynos.c +++ b/drivers/usb/host/ohci-exynos.c @@ -212,8 +212,7 @@ static void exynos_ohci_shutdown(struct platform_device *pdev) hcd->driver->shutdown(hcd); } -#ifdef CONFIG_PM -static int exynos_ohci_suspend(struct device *dev) +static int __maybe_unused exynos_ohci_suspend(struct device *dev) { struct usb_hcd *hcd = dev_get_drvdata(dev); struct exynos_ohci_hcd *exynos_ohci = to_exynos_ohci(hcd); @@ -230,7 +229,7 @@ static int exynos_ohci_suspend(struct device *dev) return 0; } -static int exynos_ohci_resume(struct device *dev) +static int __maybe_unused exynos_ohci_resume(struct device *dev) { struct usb_hcd *hcd = dev_get_drvdata(dev); struct exynos_ohci_hcd *exynos_ohci = to_exynos_ohci(hcd); @@ -249,10 +248,6 @@ static int exynos_ohci_resume(struct device *dev) return 0; } -#else -#define exynos_ohci_suspend NULL -#define exynos_ohci_resume NULL -#endif static const struct ohci_driver_overrides exynos_overrides __initconst = { .extra_priv_size = sizeof(struct exynos_ohci_hcd), @@ -277,7 +272,7 @@ static struct platform_driver exynos_ohci_driver = { .shutdown = exynos_ohci_shutdown, .driver = { .name = "exynos-ohci", - .pm = &exynos_ohci_pm_ops, + .pm = pm_ptr(&exynos_ohci_pm_ops), .of_match_table = of_match_ptr(exynos_ohci_match), } };
Use the new PM macros for the suspend and resume functions to be automatically dropped by the compiler when CONFIG_PM are disabled, without having to use #ifdef guards. If CONFIG_PM unused, they will simply be discarded by the compiler. Signed-off-by: Anand Moon <linux.amoon@gmail.com> --- v2: new changes in this series. --- drivers/usb/host/ohci-exynos.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-)