From c281089ed6d3bb1d3f2b7a1ac0aa7775c2f99433 Mon Sep 17 00:00:00 2001
From: Rajagopal Venkat <rajagopal.venkat@linaro.org>
Date: Thu, 21 Mar 2013 13:28:25 +0000
Subject: [PATCH] --- yaml --- r: 362205 b: refs/heads/master c:
 5faaa035ddc16d3d2e31c0bfc1c4756b6869dbcc h: refs/heads/master i:   362203:
 ac7ef3614158fcd584608721e48c298e5b29cb75 v: v3

---
 [refs]                        |  2 +-
 trunk/include/linux/devfreq.h | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 30227c517ea1..cdb4a2f50f93 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0f703069296664eb7c649c837cc8bb936c3ef07f
+refs/heads/master: 5faaa035ddc16d3d2e31c0bfc1c4756b6869dbcc
diff --git a/trunk/include/linux/devfreq.h b/trunk/include/linux/devfreq.h
index e83ef39b3bea..fe8c4476f7e4 100644
--- a/trunk/include/linux/devfreq.h
+++ b/trunk/include/linux/devfreq.h
@@ -213,7 +213,7 @@ struct devfreq_simple_ondemand_data {
 #endif
 
 #else /* !CONFIG_PM_DEVFREQ */
-static struct devfreq *devfreq_add_device(struct device *dev,
+static inline struct devfreq *devfreq_add_device(struct device *dev,
 					  struct devfreq_dev_profile *profile,
 					  const char *governor_name,
 					  void *data)
@@ -221,34 +221,34 @@ static struct devfreq *devfreq_add_device(struct device *dev,
 	return NULL;
 }
 
-static int devfreq_remove_device(struct devfreq *devfreq)
+static inline int devfreq_remove_device(struct devfreq *devfreq)
 {
 	return 0;
 }
 
-static int devfreq_suspend_device(struct devfreq *devfreq)
+static inline int devfreq_suspend_device(struct devfreq *devfreq)
 {
 	return 0;
 }
 
-static int devfreq_resume_device(struct devfreq *devfreq)
+static inline int devfreq_resume_device(struct devfreq *devfreq)
 {
 	return 0;
 }
 
-static struct opp *devfreq_recommended_opp(struct device *dev,
+static inline struct opp *devfreq_recommended_opp(struct device *dev,
 					   unsigned long *freq, u32 flags)
 {
-	return -EINVAL;
+	return ERR_PTR(-EINVAL);
 }
 
-static int devfreq_register_opp_notifier(struct device *dev,
+static inline int devfreq_register_opp_notifier(struct device *dev,
 					 struct devfreq *devfreq)
 {
 	return -EINVAL;
 }
 
-static int devfreq_unregister_opp_notifier(struct device *dev,
+static inline int devfreq_unregister_opp_notifier(struct device *dev,
 					   struct devfreq *devfreq)
 {
 	return -EINVAL;