Merge remote-tracking branches 'regulator/topic/s5m8767', 'regulator/topic/stub'...

[karo-tx-linux.git] / include / linux / regulator / consumer.h

diff --git a/include/linux/regulator/consumer.h b/include/linux/regulator/consumer.h
index e530681bea7049cfa818e66acea0bf863952d281..a2d9d81038d197e289e5f38d55a89276d158daa7 100644 (file)
--- a/include/linux/regulator/consumer.h
+++ b/include/linux/regulator/consumer.h
@@ -151,11 +151,13 @@ int regulator_register_supply_alias(struct device *dev, const char *id,
                                    const char *alias_id);
 void regulator_unregister_supply_alias(struct device *dev, const char *id);
 
-int regulator_bulk_register_supply_alias(struct device *dev, const char **id,
+int regulator_bulk_register_supply_alias(struct device *dev,
+                                        const char *const *id,
                                         struct device *alias_dev,
-                                        const char **alias_id, int num_id);
+                                        const char *const *alias_id,
+                                        int num_id);
 void regulator_bulk_unregister_supply_alias(struct device *dev,
-                                           const char **id, int num_id);
+                                           const char * const *id, int num_id);
 
 int devm_regulator_register_supply_alias(struct device *dev, const char *id,
                                         struct device *alias_dev,
@@ -164,12 +166,12 @@ void devm_regulator_unregister_supply_alias(struct device *dev,
                                            const char *id);
 
 int devm_regulator_bulk_register_supply_alias(struct device *dev,
-                                             const char **id,
+                                             const char *const *id,
                                              struct device *alias_dev,
-                                             const char **alias_id,
+                                             const char *const *alias_id,
                                              int num_id);
 void devm_regulator_bulk_unregister_supply_alias(struct device *dev,
-                                                const char **id,
+                                                const char *const *id,
                                                 int num_id);
 
 /* regulator output control and status */
@@ -258,14 +260,14 @@ regulator_get_exclusive(struct device *dev, const char *id)
 static inline struct regulator *__must_check
 regulator_get_optional(struct device *dev, const char *id)
 {
-       return NULL;
+       return ERR_PTR(-ENODEV);
 }
 
 
 static inline struct regulator *__must_check
 devm_regulator_get_optional(struct device *dev, const char *id)
 {
-       return NULL;
+       return ERR_PTR(-ENODEV);
 }
 
 static inline void regulator_put(struct regulator *regulator)
@@ -290,17 +292,17 @@ static inline void regulator_unregister_supply_alias(struct device *dev,
 }
 
 static inline int regulator_bulk_register_supply_alias(struct device *dev,
-                                                      const char **id,
-                                                      struct device *alias_dev,
-                                                      const char **alias_id,
-                                                      int num_id)
+                                               const char *const *id,
+                                               struct device *alias_dev,
+                                               const char * const *alias_id,
+                                               int num_id)
 {
        return 0;
 }
 
 static inline void regulator_bulk_unregister_supply_alias(struct device *dev,
-                                                         const char **id,
-                                                         int num_id)
+                                               const char * const *id,
+                                               int num_id)
 {
 }
 
@@ -317,15 +319,17 @@ static inline void devm_regulator_unregister_supply_alias(struct device *dev,
 {
 }
 
-static inline int devm_regulator_bulk_register_supply_alias(
-               struct device *dev, const char **id, struct device *alias_dev,
-               const char **alias_id, int num_id)
+static inline int devm_regulator_bulk_register_supply_alias(struct device *dev,
+                                               const char *const *id,
+                                               struct device *alias_dev,
+                                               const char *const *alias_id,
+                                               int num_id)
 {
        return 0;
 }
 
 static inline void devm_regulator_bulk_unregister_supply_alias(
-               struct device *dev, const char **id, int num_id)
+       struct device *dev, const char *const *id, int num_id)
 {
 }
 
@@ -397,6 +401,12 @@ static inline int regulator_set_voltage(struct regulator *regulator,
        return 0;
 }
 
+static inline int regulator_set_voltage_time(struct regulator *regulator,
+                                            int old_uV, int new_uV)
+{
+       return 0;
+}
+
 static inline int regulator_get_voltage(struct regulator *regulator)
 {
        return -EINVAL;