diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2012-07-19 00:03:50 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rjw@sisk.pl> | 2012-07-19 00:03:50 +0200 |
| commit | bd798b7a88069b6ad273214ca3901d988104db71 (patch) | |
| tree | 178e6dc336e5db6bc5ffae344d5891b0071354ff | |
| parent | b4269e2799993fce54f5003a3597e6fa8b621993 (diff) | |
| parent | ad0446eb11b6886a73e077bd087f98544b8c0403 (diff) | |
Merge branch 'pm-qos'
* pm-qos:
PM / QoS: Use NULL pointer instead of plain integer in qos.c
PM / QoS: Use NULL pointer instead of plain integer in pm_qos.h
| -rw-r--r-- | drivers/base/power/qos.c | 2 | ||||
| -rw-r--r-- | include/linux/pm_qos.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/base/power/qos.c b/drivers/base/power/qos.c index fd849a2c4fa8..74a67e0019a2 100644 --- a/drivers/base/power/qos.c +++ b/drivers/base/power/qos.c @@ -462,7 +462,7 @@ EXPORT_SYMBOL_GPL(dev_pm_qos_add_ancestor_request); static void __dev_pm_qos_drop_user_request(struct device *dev) { dev_pm_qos_remove_request(dev->power.pq_req); - dev->power.pq_req = 0; + dev->power.pq_req = NULL; } /** diff --git a/include/linux/pm_qos.h b/include/linux/pm_qos.h index 233149cb19f4..9924ea1f22e0 100644 --- a/include/linux/pm_qos.h +++ b/include/linux/pm_qos.h @@ -66,7 +66,7 @@ enum pm_qos_req_action { static inline int dev_pm_qos_request_active(struct dev_pm_qos_request *req) { - return req->dev != 0; + return req->dev != NULL; } int pm_qos_update_target(struct pm_qos_constraints *c, struct plist_node *node, |