From: 黄涛 <huangtao@rock-chips.com>
Date: Mon, 25 Jul 2011 08:55:47 +0000 (+0800)
Subject: rk29: include/linux/regulator/consumer.h: fix warning: no return statement in functio... 
X-Git-Tag: firefly_0821_release~10089^2~3
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=b877bcb0ec245941600b2bd3754a2bc69d775e3b;p=firefly-linux-kernel-4.4.55.git

rk29: include/linux/regulator/consumer.h: fix warning: no return statement in function returning non-void
---

diff --git a/include/linux/regulator/consumer.h b/include/linux/regulator/consumer.h
index 73286b2b29eb..2e94871b2fdd 100755
--- a/include/linux/regulator/consumer.h
+++ b/include/linux/regulator/consumer.h
@@ -149,9 +149,9 @@ int regulator_list_voltage(struct regulator *regulator, unsigned selector);
 int regulator_is_supported_voltage(struct regulator *regulator,
 				   int min_uV, int max_uV);
 int regulator_set_voltage(struct regulator *regulator, int min_uV, int max_uV);
-
+#ifdef CONFIG_ARCH_RK29
 int regulator_set_suspend_voltage(struct regulator *regulator, int uV);
-
+#endif
 int regulator_get_voltage(struct regulator *regulator);
 int regulator_set_current_limit(struct regulator *regulator,
 			       int min_uA, int max_uA);
@@ -234,12 +234,13 @@ static inline int regulator_set_voltage(struct regulator *regulator,
 {
 	return 0;
 }
-static int regulator_set_suspend_voltage(struct regulator *regulator, int uV)
-{
-
-
 
+#ifdef CONFIG_ARCH_RK29
+static inline int regulator_set_suspend_voltage(struct regulator *regulator, int uV)
+{
+	return 0;
 }
+#endif
 
 static inline int regulator_get_voltage(struct regulator *regulator)
 {