Merge "regulator: core: remove some dead code" (71faca45) · Commits · e / devices / android_kernel_sony_msm8998

drivers/regulator/core.c

+3 −8

Original line number	Diff line number	Diff line
		@@ -2395,7 +2395,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;
		@@ -2407,12 +2406,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);