[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <1701634.Jkkbu1sQKe@vostro.rjw.lan>
Date: Mon, 08 Oct 2012 10:06:08 +0200
From: "Rafael J. Wysocki" <rjw@...k.pl>
To: Linux PM list <linux-pm@...r.kernel.org>
Cc: ACPI Devel Mailing List <linux-acpi@...r.kernel.org>,
Alan Stern <stern@...land.harvard.edu>,
Huang Ying <ying.huang@...el.com>,
Sarah Sharp <sarah.a.sharp@...ux.intel.com>,
Lan Tianyu <tianyu.lan@...el.com>,
Aaron Lu <aaron.lu@...el.com>, Jean Pihet <j-pihet@...com>,
linux-pci@...r.kernel.org,
Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
mark gross <markgross@...gnar.org>,
LKML <linux-kernel@...r.kernel.org>
Subject: [PATCH 3/7] PM / QoS: Prepare struct dev_pm_qos_request for more request types
From: Rafael J. Wysocki <rafael.j.wysocki@...el.com>
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@...el.com>
Reviewed-by: Jean Pihet <j-pihet@...com>
---
drivers/base/power/qos.c | 6 +++---
drivers/base/power/sysfs.c | 2 +-
include/linux/pm_qos.h | 4 +++-
3 files changed, 7 insertions(+), 5 deletions(-)
Index: linux/include/linux/pm_qos.h
===================================================================
--- linux.orig/include/linux/pm_qos.h
+++ linux/include/linux/pm_qos.h
@@ -39,7 +39,9 @@ struct pm_qos_flags_request {
};
struct dev_pm_qos_request {
- struct plist_node node;
+ union {
+ struct plist_node pnode;
+ } data;
struct device *dev;
};
Index: linux/drivers/base/power/sysfs.c
===================================================================
--- linux.orig/drivers/base/power/sysfs.c
+++ linux/drivers/base/power/sysfs.c
@@ -221,7 +221,7 @@ static DEVICE_ATTR(autosuspend_delay_ms,
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,
Index: linux/drivers/base/power/qos.c
===================================================================
--- linux.orig/drivers/base/power/qos.c
+++ linux/drivers/base/power/qos.c
@@ -90,7 +90,7 @@ static int apply_constraint(struct dev_p
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 @@ void dev_pm_qos_constraints_destroy(stru
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 @@ int dev_pm_qos_update_request(struct dev
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 {
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists