Merge branch 'regulator-4.20' into regulator-linus (67a2ab93) · Commits · e / devices / android_kernel_fairphone_FP5

drivers/regulator/bd718x7-regulator.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -9,6 +9,7 @@
		#include <linux/kernel.h>
		#include <linux/mfd/rohm-bd718x7.h>
		#include <linux/module.h>
		#include <linux/of.h>
		#include <linux/platform_device.h>
		#include <linux/regulator/driver.h>
		#include <linux/regulator/machine.h>

+11 −11

Original line number	Diff line number	Diff line
		@@ -1158,17 +1158,6 @@ static int set_machine_constraints(struct regulator_dev *rdev,
		}
		}

		/* If the constraints say the regulator should be on at this point
		* and we have control then make sure it is enabled.
		*/
		if (rdev->constraints->always_on \|\| rdev->constraints->boot_on) {
		ret = _regulator_do_enable(rdev);
		if (ret < 0 && ret != -EINVAL) {
		rdev_err(rdev, "failed to enable\n");
		return ret;
		}
		}

		if ((rdev->constraints->ramp_delay \|\| rdev->constraints->ramp_disable)
		&& ops->set_ramp_delay) {
		ret = ops->set_ramp_delay(rdev, rdev->constraints->ramp_delay);
		@@ -1214,6 +1203,17 @@ static int set_machine_constraints(struct regulator_dev *rdev,
		}
		}

		/* If the constraints say the regulator should be on at this point
		* and we have control then make sure it is enabled.
		*/
		if (rdev->constraints->always_on \|\| rdev->constraints->boot_on) {
		ret = _regulator_do_enable(rdev);
		if (ret < 0 && ret != -EINVAL) {
		rdev_err(rdev, "failed to enable\n");
		return ret;
		}
		}

		print_constraints(rdev);
		return 0;
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -508,7 +508,7 @@ static inline int regulator_get_error_flags(struct regulator *regulator,

		static inline int regulator_set_load(struct regulator *regulator, int load_uA)
		{
		return REGULATOR_MODE_NORMAL;
		return 0;
		}

		static inline int regulator_allow_bypass(struct regulator *regulator,