History

Merge back earlier PM core material for v5.1.

Rafael J. Wysocki committed 7 years ago

Commit 656f72b2 parents 74fb448 85945c210 files · +108 −43Browse files

Showing the changes to include/linux (3 of 10 files). Show all

Unified · Split

3 files
  1. include/linux/device.h +10 −0
  2. include/linux/pm.h +4 −3
  3. include/linux/pm_runtime.h +2 −0
include/linux/device.h+10−0
@@ -1165,6 +1165,16 @@ static inline bool device_async_suspend_enabled(struct device *dev) · 1164 unmodified lines
11651165 return !!dev->power.async_suspend;
11661166 }
11671167
1168+static inline bool device_pm_not_required(struct device *dev)
1169+{
1170+ return dev->power.no_pm;
1171+}
1172+
1173+static inline void device_set_pm_not_required(struct device *dev)
1174+{
1175+ dev->power.no_pm = true;
1176+}
1177+
11681178 static inline void dev_pm_syscore_device(struct device *dev, bool val)
11691179 {
11701180 #ifdef CONFIG_PM_SLEEP
include/linux/pm.h+4−3
@@ -592,6 +592,7 @@ struct dev_pm_info { · 591 unmodified lines
592592 bool is_suspended:1; /* Ditto */
593593 bool is_noirq_suspended:1;
594594 bool is_late_suspended:1;
595+ bool no_pm:1;
595596 bool early_init:1; /* Owned by the PM core */
596597 bool direct_complete:1; /* Owned by the PM core */
597598 u32 driver_flags;
@@ -633,9 +634,9 @@ struct dev_pm_info { · 35 unmodified lines
633634 int runtime_error;
634635 int autosuspend_delay;
635636 u64 last_busy;
636− unsigned long active_jiffies;
637− unsigned long suspended_jiffies;
638− unsigned long accounting_timestamp;
637+ u64 active_time;
638+ u64 suspended_time;
639+ u64 accounting_timestamp;
639640 #endif
640641 struct pm_subsys_data *subsys_data; /* Owned by the subsystem. */
641642 void (*set_latency_tolerance)(struct device *, s32);
include/linux/pm_runtime.h+2−0
@@ -113,6 +113,8 @@ static inline bool pm_runtime_is_irq_safe(struct device *dev) · 112 unmodified lines
113113 return dev->power.irq_safe;
114114 }
115115
116+extern u64 pm_runtime_suspended_time(struct device *dev);
117+
116118 #else /* !CONFIG_PM */
117119
118120 static inline bool queue_pm_work(struct work_struct *work) { return false; }

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t