Merge commit 'pm-fixes-for-3.3-rc3' into pm-qos

New material in the pm-qos branch depends on recent power management
fixes.

1 files changed, 13 insertions, 1 deletions

diff --git a/include/linux/pm_qos.h b/include/linux/pm_qos.h
index 5ac91d8..67c5217 100644
--- a/include/linux/pm_qos.h
+++ b/include/linux/pm_qos.h
@@ -114,7 +114,19 @@ static inline void pm_qos_remove_request(struct pm_qos_request *req)
 			{ return; }
 
 static inline int pm_qos_request(int pm_qos_class)
-			{ return 0; }
+{
+	switch (pm_qos_class) {
+	case PM_QOS_CPU_DMA_LATENCY:
+		return PM_QOS_CPU_DMA_LAT_DEFAULT_VALUE;
+	case PM_QOS_NETWORK_LATENCY:
+		return PM_QOS_NETWORK_LAT_DEFAULT_VALUE;
+	case PM_QOS_NETWORK_THROUGHPUT:
+		return PM_QOS_NETWORK_THROUGHPUT_DEFAULT_VALUE;
+	default:
+		return PM_QOS_DEFAULT_VALUE;
+	}
+}
+
 static inline int pm_qos_add_notifier(int pm_qos_class,
 				      struct notifier_block *notifier)
 			{ return 0; }