Skip to content

Commit 4e1d9a7

Browse files
pchotardrafaeljw
authored andcommitted
PM: sleep: Add dev_wakeup_path() helper
Add dev_wakeup_path() helper to avoid to spread dev->power.wakeup_path test in drivers. Signed-off-by: Patrice Chotard <[email protected]> Reviewed-by: Ulf Hansson <[email protected]> Signed-off-by: Rafael J. Wysocki <[email protected]>
1 parent ab150c3 commit 4e1d9a7

File tree

4 files changed

+16
-6
lines changed

4 files changed

+16
-6
lines changed

drivers/base/power/domain.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1142,7 +1142,7 @@ static int genpd_finish_suspend(struct device *dev, bool poweroff)
11421142
if (ret)
11431143
return ret;
11441144

1145-
if (dev->power.wakeup_path && genpd_is_active_wakeup(genpd))
1145+
if (device_wakeup_path(dev) && genpd_is_active_wakeup(genpd))
11461146
return 0;
11471147

11481148
if (genpd->dev_ops.stop && genpd->dev_ops.start &&
@@ -1196,7 +1196,7 @@ static int genpd_resume_noirq(struct device *dev)
11961196
if (IS_ERR(genpd))
11971197
return -EINVAL;
11981198

1199-
if (dev->power.wakeup_path && genpd_is_active_wakeup(genpd))
1199+
if (device_wakeup_path(dev) && genpd_is_active_wakeup(genpd))
12001200
return pm_generic_resume_noirq(dev);
12011201

12021202
genpd_lock(genpd);

drivers/base/power/main.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1359,7 +1359,7 @@ static void dpm_propagate_wakeup_to_parent(struct device *dev)
13591359

13601360
spin_lock_irq(&parent->power.lock);
13611361

1362-
if (dev->power.wakeup_path && !parent->power.ignore_children)
1362+
if (device_wakeup_path(dev) && !parent->power.ignore_children)
13631363
parent->power.wakeup_path = true;
13641364

13651365
spin_unlock_irq(&parent->power.lock);
@@ -1627,7 +1627,7 @@ static int __device_suspend(struct device *dev, pm_message_t state, bool async)
16271627
goto Complete;
16281628

16291629
/* Avoid direct_complete to let wakeup_path propagate. */
1630-
if (device_may_wakeup(dev) || dev->power.wakeup_path)
1630+
if (device_may_wakeup(dev) || device_wakeup_path(dev))
16311631
dev->power.direct_complete = false;
16321632

16331633
if (dev->power.direct_complete) {

drivers/i2c/busses/i2c-stm32f7.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2322,7 +2322,7 @@ static int stm32f7_i2c_suspend(struct device *dev)
23222322

23232323
i2c_mark_adapter_suspended(&i2c_dev->adap);
23242324

2325-
if (!device_may_wakeup(dev) && !dev->power.wakeup_path) {
2325+
if (!device_may_wakeup(dev) && !device_wakeup_path(dev)) {
23262326
ret = stm32f7_i2c_regs_backup(i2c_dev);
23272327
if (ret < 0) {
23282328
i2c_mark_adapter_resumed(&i2c_dev->adap);
@@ -2341,7 +2341,7 @@ static int stm32f7_i2c_resume(struct device *dev)
23412341
struct stm32f7_i2c_dev *i2c_dev = dev_get_drvdata(dev);
23422342
int ret;
23432343

2344-
if (!device_may_wakeup(dev) && !dev->power.wakeup_path) {
2344+
if (!device_may_wakeup(dev) && !device_wakeup_path(dev)) {
23452345
ret = pm_runtime_force_resume(dev);
23462346
if (ret < 0)
23472347
return ret;

include/linux/pm_wakeup.h

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,11 @@ static inline bool device_may_wakeup(struct device *dev)
8484
return dev->power.can_wakeup && !!dev->power.wakeup;
8585
}
8686

87+
static inline bool device_wakeup_path(struct device *dev)
88+
{
89+
return dev->power.wakeup_path;
90+
}
91+
8792
static inline void device_set_wakeup_path(struct device *dev)
8893
{
8994
dev->power.wakeup_path = true;
@@ -174,6 +179,11 @@ static inline bool device_may_wakeup(struct device *dev)
174179
return dev->power.can_wakeup && dev->power.should_wakeup;
175180
}
176181

182+
static inline bool device_wakeup_path(struct device *dev)
183+
{
184+
return false;
185+
}
186+
177187
static inline void device_set_wakeup_path(struct device *dev) {}
178188

179189
static inline void __pm_stay_awake(struct wakeup_source *ws) {}

0 commit comments

Comments
 (0)