PM / QoS: Prepare struct dev_pm_qos_request for more request types
The subsequent patches will use struct dev_pm_qos_request for
representing both latency requests and flags requests. To make that
easier, put the node member of struct dev_pm_qos_request (under the
name "pnode") into a union called "data" that will represent the
request's value and list node depending on its type.
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Reviewed-by: Jean Pihet <j-pihet@ti.com>
Reviewed-by: mark gross <markgross@thegnar.org>
diff --git a/drivers/base/power/qos.c b/drivers/base/power/qos.c
index 40ff1b0..96d27b8 100644
--- a/drivers/base/power/qos.c
+++ b/drivers/base/power/qos.c
@@ -90,7 +90,7 @@
int ret, curr_value;
ret = pm_qos_update_target(&req->dev->power.qos->latency,
- &req->node, action, value);
+ &req->data.pnode, action, value);
if (ret) {
/* Call the global callbacks if needed */
@@ -183,7 +183,7 @@
c = &qos->latency;
/* Flush the constraints list for the device */
- plist_for_each_entry_safe(req, tmp, &c->list, node) {
+ plist_for_each_entry_safe(req, tmp, &c->list, data.pnode) {
/*
* Update constraints list and call the notification
* callbacks if needed
@@ -293,7 +293,7 @@
mutex_lock(&dev_pm_qos_mtx);
if (req->dev->power.qos) {
- if (new_value != req->node.prio)
+ if (new_value != req->data.pnode.prio)
ret = apply_constraint(req, PM_QOS_UPDATE_REQ,
new_value);
} else {
diff --git a/drivers/base/power/sysfs.c b/drivers/base/power/sysfs.c
index b91dc6f..54c61ff 100644
--- a/drivers/base/power/sysfs.c
+++ b/drivers/base/power/sysfs.c
@@ -221,7 +221,7 @@
static ssize_t pm_qos_latency_show(struct device *dev,
struct device_attribute *attr, char *buf)
{
- return sprintf(buf, "%d\n", dev->power.pq_req->node.prio);
+ return sprintf(buf, "%d\n", dev->power.pq_req->data.pnode.prio);
}
static ssize_t pm_qos_latency_store(struct device *dev,
diff --git a/include/linux/pm_qos.h b/include/linux/pm_qos.h
index 413ada3..3b9d149 100644
--- a/include/linux/pm_qos.h
+++ b/include/linux/pm_qos.h
@@ -39,7 +39,9 @@
};
struct dev_pm_qos_request {
- struct plist_node node;
+ union {
+ struct plist_node pnode;
+ } data;
struct device *dev;
};