Commit bd798b7a authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

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
parents b4269e27 ad0446eb

drivers/base/power/qos.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

}



/**

include/linux/pm_qos.h

+1 −1
Original line number Diff line number Diff line
@@ -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,