Merge branch 'regulator-5.7' into regulator-next

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/regulator/da9063-regulator.c
index 6d07e6864173d2f3658c695f047f1e4684d7a575,44727704d3c5f210ef847e9d5f7a167b068d0b6d..e1d6c8f6d40bbaf8971d4d5f540e68bfa3dfe1e2
--- 1/drivers/regulator/da9063-regulator.c
--- 2/drivers/regulator/da9063-regulator.c
+++ b/drivers/regulator/da9063-regulator.c
@@@ -223,9 -229,10 +231,9 @@@ static int da9063_buck_set_mode(struct 
   * There are 3 modes to map to: FAST, NORMAL, and STANDBY.
   */
  
- static unsigned da9063_buck_get_mode(struct regulator_dev *rdev)
+ static unsigned int da9063_buck_get_mode(struct regulator_dev *rdev)
  {
        struct da9063_regulator *regl = rdev_get_drvdata(rdev);
 -      struct regmap_field *field;
        unsigned int val;
        int ret;
  
@@@ -280,12 -298,24 +288,12 @@@ static int da9063_ldo_set_mode(struct r
        return regmap_field_write(regl->sleep, val);
  }
  
- static unsigned da9063_ldo_get_mode(struct regulator_dev *rdev)
+ static unsigned int da9063_ldo_get_mode(struct regulator_dev *rdev)
  {
        struct da9063_regulator *regl = rdev_get_drvdata(rdev);
 -      struct regmap_field *field;
        int ret, val;
  
 -      /* Detect current regulator state */
 -      ret = regmap_field_read(regl->suspend, &val);
 -      if (ret < 0)
 -              return 0;
 -
 -      /* Read regulator mode from proper register, depending on state */
 -      if (val)
 -              field = regl->suspend_sleep;
 -      else
 -              field = regl->sleep;
 -
 -      ret = regmap_field_read(field, &val);
 +      ret = regmap_field_read(regl->sleep, &val);
        if (ret < 0)
                return 0;