| From 7c68936add8d8da87bbbc2f2574c38a273e7f1c3 Mon Sep 17 00:00:00 2001 |
| From: Guennadi Liakhovetski <g.liakhovetski@gmx.de> |
| Date: Thu, 10 Nov 2011 00:44:18 +0100 |
| Subject: PM / QoS: Properly use the WARN() macro in dev_pm_qos_add_request() |
| |
| Make dev_pm_qos_add_request() use WARN() in a better way and do not hardcode |
| the function's name into the message (use __func__ instead). |
| |
| Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> |
| Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl> |
| (cherry picked from commit af4c720efc0507e01b89774fed936087baac4107) |
| |
| Signed-off-by: Simon Horman <horms@verge.net.au> |
| --- |
| drivers/base/power/qos.c | 18 ++++++------------ |
| 1 file changed, 6 insertions(+), 12 deletions(-) |
| |
| diff --git a/drivers/base/power/qos.c b/drivers/base/power/qos.c |
| index 30a94ea..86de6c5 100644 |
| --- a/drivers/base/power/qos.c |
| +++ b/drivers/base/power/qos.c |
| @@ -212,11 +212,9 @@ int dev_pm_qos_add_request(struct device *dev, struct dev_pm_qos_request *req, |
| if (!dev || !req) /*guard against callers passing in null */ |
| return -EINVAL; |
| |
| - if (dev_pm_qos_request_active(req)) { |
| - WARN(1, KERN_ERR "dev_pm_qos_add_request() called for already " |
| - "added request\n"); |
| + if (WARN(dev_pm_qos_request_active(req), |
| + "%s() called for already added request\n", __func__)) |
| return -EINVAL; |
| - } |
| |
| req->dev = dev; |
| |
| @@ -271,11 +269,9 @@ int dev_pm_qos_update_request(struct dev_pm_qos_request *req, |
| if (!req) /*guard against callers passing in null */ |
| return -EINVAL; |
| |
| - if (!dev_pm_qos_request_active(req)) { |
| - WARN(1, KERN_ERR "dev_pm_qos_update_request() called for " |
| - "unknown object\n"); |
| + if (WARN(!dev_pm_qos_request_active(req), |
| + "%s() called for unknown object\n", __func__)) |
| return -EINVAL; |
| - } |
| |
| mutex_lock(&dev_pm_qos_mtx); |
| |
| @@ -312,11 +308,9 @@ int dev_pm_qos_remove_request(struct dev_pm_qos_request *req) |
| if (!req) /*guard against callers passing in null */ |
| return -EINVAL; |
| |
| - if (!dev_pm_qos_request_active(req)) { |
| - WARN(1, KERN_ERR "dev_pm_qos_remove_request() called for " |
| - "unknown object\n"); |
| + if (WARN(!dev_pm_qos_request_active(req), |
| + "%s() called for unknown object\n", __func__)) |
| return -EINVAL; |
| - } |
| |
| mutex_lock(&dev_pm_qos_mtx); |
| |
| -- |
| 1.7.10.1.362.g242cab3 |
| |