| Message ID | 20191016141627.18642-1-ulf.hansson@linaro.org |
|---|---|
| State | Accepted |
| Commit | ea0d11c9dd95d685fe94299847446e6ad9594c39 |
| Headers | show |
| Series | PM / core: Cleanup some function definitions in power.h | expand |
On Wednesday, October 16, 2019 4:16:27 PM CET Ulf Hansson wrote: > The power.h is a bit messy due to the various existing CONFIG_PM* Kconfig > combinations. However the final section for wakeup_source_sysfs*() can be > moved inside one of the existing sections rather than adding yet another > one, so let's do that to clean up the code a little bit. Fair enough. > Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> > --- > drivers/base/power/power.h | 30 ++++++++++++------------------ > 1 file changed, 12 insertions(+), 18 deletions(-) > > diff --git a/drivers/base/power/power.h b/drivers/base/power/power.h > index 39a06a0cfdaa..444f5c169a0b 100644 > --- a/drivers/base/power/power.h > +++ b/drivers/base/power/power.h > @@ -117,6 +117,13 @@ static inline bool device_pm_initialized(struct device *dev) > return dev->power.in_dpm_list; > } > > +/* drivers/base/power/wakeup_stats.c */ > +extern int wakeup_source_sysfs_add(struct device *parent, > + struct wakeup_source *ws); > +extern void wakeup_source_sysfs_remove(struct wakeup_source *ws); > + > +extern int pm_wakeup_source_sysfs_add(struct device *parent); > + > #else /* !CONFIG_PM_SLEEP */ > > static inline void device_pm_sleep_init(struct device *dev) {} > @@ -141,6 +148,11 @@ static inline bool device_pm_initialized(struct device *dev) > return device_is_registered(dev); > } > > +static inline int pm_wakeup_source_sysfs_add(struct device *parent) > +{ > + return 0; > +} > + > #endif /* !CONFIG_PM_SLEEP */ > > static inline void device_pm_init(struct device *dev) > @@ -149,21 +161,3 @@ static inline void device_pm_init(struct device *dev) > device_pm_sleep_init(dev); > pm_runtime_init(dev); > } > - > -#ifdef CONFIG_PM_SLEEP > - > -/* drivers/base/power/wakeup_stats.c */ > -extern int wakeup_source_sysfs_add(struct device *parent, > - struct wakeup_source *ws); > -extern void wakeup_source_sysfs_remove(struct wakeup_source *ws); > - > -extern int pm_wakeup_source_sysfs_add(struct device *parent); > - > -#else /* !CONFIG_PM_SLEEP */ > - > -static inline int pm_wakeup_source_sysfs_add(struct device *parent) > -{ > - return 0; > -} > - > -#endif /* CONFIG_PM_SLEEP */ > Applying as 5.5 material, thanks!
diff --git a/drivers/base/power/power.h b/drivers/base/power/power.h index 39a06a0cfdaa..444f5c169a0b 100644 --- a/drivers/base/power/power.h +++ b/drivers/base/power/power.h @@ -117,6 +117,13 @@ static inline bool device_pm_initialized(struct device *dev) return dev->power.in_dpm_list; } +/* drivers/base/power/wakeup_stats.c */ +extern int wakeup_source_sysfs_add(struct device *parent, + struct wakeup_source *ws); +extern void wakeup_source_sysfs_remove(struct wakeup_source *ws); + +extern int pm_wakeup_source_sysfs_add(struct device *parent); + #else /* !CONFIG_PM_SLEEP */ static inline void device_pm_sleep_init(struct device *dev) {} @@ -141,6 +148,11 @@ static inline bool device_pm_initialized(struct device *dev) return device_is_registered(dev); } +static inline int pm_wakeup_source_sysfs_add(struct device *parent) +{ + return 0; +} + #endif /* !CONFIG_PM_SLEEP */ static inline void device_pm_init(struct device *dev) @@ -149,21 +161,3 @@ static inline void device_pm_init(struct device *dev) device_pm_sleep_init(dev); pm_runtime_init(dev); } - -#ifdef CONFIG_PM_SLEEP - -/* drivers/base/power/wakeup_stats.c */ -extern int wakeup_source_sysfs_add(struct device *parent, - struct wakeup_source *ws); -extern void wakeup_source_sysfs_remove(struct wakeup_source *ws); - -extern int pm_wakeup_source_sysfs_add(struct device *parent); - -#else /* !CONFIG_PM_SLEEP */ - -static inline int pm_wakeup_source_sysfs_add(struct device *parent) -{ - return 0; -} - -#endif /* CONFIG_PM_SLEEP */
The power.h is a bit messy due to the various existing CONFIG_PM* Kconfig combinations. However the final section for wakeup_source_sysfs*() can be moved inside one of the existing sections rather than adding yet another one, so let's do that to clean up the code a little bit. Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> --- drivers/base/power/power.h | 30 ++++++++++++------------------ 1 file changed, 12 insertions(+), 18 deletions(-) -- 2.17.1