diff options
| author | Linux Build Service Account <lnxbuild@quicinc.com> | 2017-07-06 04:38:57 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-07-06 04:38:57 -0700 |
| commit | 71faca45507b1b603bac6df6441845ddad9bdc2f (patch) | |
| tree | bc6da7026e895a7f38630df249e0a96934f29d03 | |
| parent | b4d55be4153c4cff9aaaa0f69dfbcff922e4c46c (diff) | |
| parent | af56eff0428221797f7b9d95c1e8083235210d14 (diff) | |
Merge "regulator: core: remove some dead code"
| -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 4f9de7fda612..adf621430b41 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c @@ -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,13 +2406,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); |