Merge remote-tracking branches 'regulator/topic/da9210', 'regulator/topic/da9211...

diff --cc drivers/regulator/core.c
index 584cbbd38d47bb59c39bb71028cec4c532ca2e70,c9f72019bd689afbb4e51528932689dc097b191b,c9f72019bd689afbb4e51528932689dc097b191b,c9f72019bd689afbb4e51528932689dc097b191b,c9f72019bd689afbb4e51528932689dc097b191b,0c0e9ab94d4d7a9468bf4a2865c891e1bca1c2e6..4315476540c4883cf27f960521578efbc9118137
--- 1/drivers/regulator/core.c
--- 2/drivers/regulator/core.c
--- 3/drivers/regulator/core.c
--- 4/drivers/regulator/core.c
--- 5/drivers/regulator/core.c
--- 6/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@@@@@@ -109,8 -109,7 -109,7 -109,7 -109,7 -109,12 +109,13 @@@@@@@ static int _regulator_do_set_voltage(st
      static struct regulator *create_regulator(struct regulator_dev *rdev,
                                          struct device *dev,
                                          const char *supply_name);
 +++++static void _regulator_put(struct regulator *regulator);
 ++++ 
+++++ static struct regulator_dev *dev_to_rdev(struct device *dev)
+++++ {
+++++   return container_of(dev, struct regulator_dev, dev);
+++++ }
+     
      static const char *rdev_get_name(struct regulator_dev *rdev)
      {
        if (rdev->constraints && rdev->constraints->name)
@@@@@@@ -1599,11 -1584,9 -1584,9 -1584,9 -1584,9 -1593,11 +1604,11 @@@@@@@ static void _regulator_put(struct regul
      {
        struct regulator_dev *rdev;
      
 -----  if (regulator == NULL || IS_ERR(regulator))
 +++++  if (IS_ERR_OR_NULL(regulator))
                return;
      
 ++++   lockdep_assert_held_once(&regulator_list_mutex);
 ++++ 
        rdev = regulator->rdev;
      
        debugfs_remove_recursive(regulator->debugfs);
@@@@@@@ -3838,11 -3813,11 -3813,11 -3813,11 -3813,11 -3836,9 +3847,9 @@@@@@@ void regulator_unregister(struct regula
        WARN_ON(rdev->open_count);
        unset_regulator_supplies(rdev);
        list_del(&rdev->list);
 ----   kfree(rdev->constraints);
 ++++   mutex_unlock(&regulator_list_mutex);
-       kfree(rdev->constraints);
        regulator_ena_gpio_free(rdev);
-----   of_node_put(rdev->dev.of_node);
        device_unregister(&rdev->dev);
 ----   mutex_unlock(&regulator_list_mutex);
      }
      EXPORT_SYMBOL_GPL(regulator_unregister);