Merge remote-tracking branch 'regulator/topic/core' into regulator-next (9fa29574) · Commits · e / devices / android_kernel_fairphone_FP4

drivers/regulator/core.c

+4 −9

Original line number	Diff line number	Diff line
		@@ -2360,7 +2360,6 @@ static void regulator_disable_work(struct work_struct *work)
		int regulator_disable_deferred(struct regulator *regulator, int ms)
		{
		struct regulator_dev *rdev = regulator->rdev;
		int ret;

		if (regulator->always_on)
		return 0;
		@@ -2372,12 +2371,8 @@ int regulator_disable_deferred(struct regulator *regulator, int ms)
		rdev->deferred_disables++;
		mutex_unlock(&rdev->mutex);

		ret = queue_delayed_work(system_power_efficient_wq,
		&rdev->disable_work,
		queue_delayed_work(system_power_efficient_wq, &rdev->disable_work,
		msecs_to_jiffies(ms));
		if (ret < 0)
		return ret;
		else
		return 0;
		}
		EXPORT_SYMBOL_GPL(regulator_disable_deferred);
		@@ -3700,7 +3695,7 @@ static umode_t regulator_attr_is_visible(struct kobject *kobj,
		struct attribute *attr, int idx)
		{
		struct device *dev = kobj_to_dev(kobj);
		struct regulator_dev *rdev = container_of(dev, struct regulator_dev, dev);
		struct regulator_dev *rdev = dev_to_rdev(dev);
		const struct regulator_ops *ops = rdev->desc->ops;
		umode_t mode = attr->mode;