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
This commit is contained in:
commit
bd798b7a88
@ -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;
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -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,
|
||||
|
Loading…
Reference in New Issue
Block a user