From: Mark Brown <broonie@kernel.org>
Date: Tue, 24 Mar 2020 17:33:09 +0000 (+0000)
Subject: Merge branch 'regulator-5.7' into regulator-next
X-Git-Tag: v5.7-rc1~188^2^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=24bd2afda8ce633385a3c96aa51181008d7252da;p=thirdparty%2Flinux.git

Merge branch 'regulator-5.7' into regulator-next
---

24bd2afda8ce633385a3c96aa51181008d7252da
diff --cc drivers/regulator/da9063-regulator.c
index 6d07e6864173d,44727704d3c5f..e1d6c8f6d40bb
--- a/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;