diff options
| author |   Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2024-04-11 20:09:21 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2024-04-11 20:09:21 +0200 |
| commit | 68313be43d4d1bc3b1a39d7d8d2887697e84607c (patch) | |
| tree | 924dfd866a3c64e72c9294a76986e17465672f88 /include | |
| parent | PM: s2idle: Make sure CPUs will wakeup directly on resume (diff) | |
| parent | PM: sleep: Take advantage of %ps to simplify debug output (diff) | |
| download | wireguard-linux-68313be43d4d1bc3b1a39d7d8d2887697e84607c.tar.xz wireguard-linux-68313be43d4d1bc3b1a39d7d8d2887697e84607c.zip | |
Merge back earlier system-wide PM changes for 6.10.
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/pm_wakeup.h | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/include/linux/pm_wakeup.h b/include/linux/pm_wakeup.h index 6eb9adaef52b..76cd1f9f1365 100644 --- a/include/linux/pm_wakeup.h +++ b/include/linux/pm_wakeup.h @@ -107,7 +107,7 @@ extern void wakeup_sources_read_unlock(int idx); extern struct wakeup_source *wakeup_sources_walk_start(void); extern struct wakeup_source *wakeup_sources_walk_next(struct wakeup_source *ws); extern int device_wakeup_enable(struct device *dev); -extern int device_wakeup_disable(struct device *dev); +extern void device_wakeup_disable(struct device *dev); extern void device_set_wakeup_capable(struct device *dev, bool capable); extern int device_set_wakeup_enable(struct device *dev, bool enable); extern void __pm_stay_awake(struct wakeup_source *ws); @@ -154,10 +154,9 @@ static inline int device_wakeup_enable(struct device *dev) return 0; } -static inline int device_wakeup_disable(struct device *dev) +static inline void device_wakeup_disable(struct device *dev) { dev->power.should_wakeup = false; - return 0; } static inline int device_set_wakeup_enable(struct device *dev, bool enable) @@ -235,11 +234,10 @@ static inline int device_init_wakeup(struct device *dev, bool enable) if (enable) { device_set_wakeup_capable(dev, true); return device_wakeup_enable(dev); - } else { - device_wakeup_disable(dev); - device_set_wakeup_capable(dev, false); - return 0; } + device_wakeup_disable(dev); + device_set_wakeup_capable(dev, false); + return 0; } #endif /* _LINUX_PM_WAKEUP_H */ |