From: Dan Carpenter Date: Thu, 7 Jan 2016 10:03:08 +0000 (+0300) Subject: UPSTREAM: regulator: core: remove some dead code X-Git-Tag: firefly_0821_release~487 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=29fa20a202a4e6d5e3ed3273c0a813120e9f3e10;p=firefly-linux-kernel-4.4.55.git UPSTREAM: regulator: core: remove some dead code Originally queue_delayed_work() used to negative error codes or 0 and 1 on success depending if the work was queued or not. It caused a lot of bugs where people treated all non-zero returns as failures so we changed it to return bool instead in d4283e937861 ('workqueue: make queueing functions return bool'). Now it never returns failure. Checking for negative values causes a static checker warning since it is impossible based on the bool type. Signed-off-by: Dan Carpenter Signed-off-by: Mark Brown (cherry picked from commit 70dc6daff090afaab588e800fca3db59bfac694e) Change-Id: I173125414dbb933e36692286e2f95541d396edc5 Signed-off-by: David Wu --- diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index 1374cc2ce8c2..c07f43415424 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c @@ -2366,7 +2366,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; @@ -2378,13 +2377,9 @@ 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, - msecs_to_jiffies(ms)); - if (ret < 0) - return ret; - else - return 0; + queue_delayed_work(system_power_efficient_wq, &rdev->disable_work, + msecs_to_jiffies(ms)); + return 0; } EXPORT_SYMBOL_GPL(regulator_disable_deferred);