Merge tag 'regulator-fix-v4.9-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator

torvalds · torvalds · commit 3f7b55b6b26d · 2016-10-31T10:14:09.000-07:00
Pull regulator fix from Mark Brown:
 "Fix ramp_delay warnings for v4.9

  A new warning was introduced for missing information about the time
  that regulators take to power on in v4.9. This is in theory a real
  issue but for most practical regulators the communication overhead of
  talking to the device is greater than the ramp time so a lot of
  drivers don't set it and the warning is far too noisy without
  identifying practical issues.

  Just remove the warning for now"

* tag 'regulator-fix-v4.9-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:
  regulator: core: silence warning: "VDD1: ramp_delay not set"
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
@@ -2754,7 +2754,7 @@ static int _regulator_set_voltage_time(struct regulator_dev *rdev,
 		ramp_delay = rdev->desc->ramp_delay;
 
 	if (ramp_delay == 0) {
-		rdev_warn(rdev, "ramp_delay not set\n");
+		rdev_dbg(rdev, "ramp_delay not set\n");
 		return 0;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -2754,7 +2754,7 @@ static int _regulator_set_voltage_time(struct regulator_dev *rdev,`
`2754`	`2754`	`ramp_delay = rdev->desc->ramp_delay;`
`2755`	`2755`
`2756`	`2756`	`if (ramp_delay == 0) {`
`2757`		`- rdev_warn(rdev, "ramp_delay not set\n");`
	`2757`	`+ rdev_dbg(rdev, "ramp_delay not set\n");`
`2758`	`2758`	`return 0;`
`2759`	`2759`	`}`
`2760`	`2760`