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

diff --combined include/linux/regulator/consumer.h
index ccd3d777ee03c8ece2d0a4b050dc752a8f87881a,e530681bea7049cfa818e66acea0bf863952d281,94719e8dce0409c11b79364ba42f9ba1d20bb661,e530681bea7049cfa818e66acea0bf863952d281,e530681bea7049cfa818e66acea0bf863952d281,e530681bea7049cfa818e66acea0bf863952d281..a2d9d81038d197e289e5f38d55a89276d158daa7
--- 1/include/linux/regulator/consumer.h
--- 2/include/linux/regulator/consumer.h
--- 3/include/linux/regulator/consumer.h
--- 4/include/linux/regulator/consumer.h
--- 5/include/linux/regulator/consumer.h
--- 6/include/linux/regulator/consumer.h
+++ b/include/linux/regulator/consumer.h
@@@@@@@ -151,13 -151,11 -151,11 -151,11 -151,11 -151,11 +151,13 @@@@@@@ int regulator_register_supply_alias(str
                                    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,
@@@@@@@ -166,12 -164,12 -164,12 -164,12 -164,12 -164,12 +166,12 @@@@@@@ void devm_regulator_unregister_supply_a
                                            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 */
@@@@@@@ -260,14 -258,14 -258,14 -258,14 -258,14 -258,14 +260,14 @@@@@@@ regulator_get_exclusive(struct device *
      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)
@@@@@@@ -292,17 -290,17 -290,17 -290,17 -290,17 -290,17 +292,17 @@@@@@@ static inline void regulator_unregister
      }
      
      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)
      {
      }
      
@@@@@@@ -319,17 -317,15 -317,15 -317,15 -317,15 -317,15 +319,17 @@@@@@@ static inline void devm_regulator_unreg
      {
      }
      
 -----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)
      {
      }
      
@@@@@@@ -401,6 -397,6 -397,12 -397,6 -397,6 -397,6 +401,12 @@@@@@@ static inline int regulator_set_voltage
        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;