diff options
author | Dan Carpenter <dan.carpenter@oracle.com> | 2016-01-07 13:03:08 +0300 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2016-01-07 15:41:02 +0000 |
commit | 70dc6daff090afaab588e800fca3db59bfac694e (patch) | |
tree | afe7c8c4d91c7c16fda2fd531c917df3c7957c25 /drivers/regulator/core.c | |
parent | 83080a140874b6860b5191b375cfdad267eaa107 (diff) |
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 <dan.carpenter@oracle.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'drivers/regulator/core.c')
-rw-r--r-- | drivers/regulator/core.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index 0853a80bf7fe..856fec528b8d 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c @@ -2368,7 +2368,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; @@ -2380,13 +2379,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); |