diff options
| author | Vladimir Zapolskiy | 2016-03-24 20:52:01 +0100 |
|---|---|---|
| committer | Mark Brown | 2016-03-25 12:12:33 +0100 |
| commit | e437b90026ac754a0f8b4fe44b844d12ce6162d1 (patch) | |
| tree | 2d8887cdfce0b9b889f7cf485d9d3af062d0a144 | |
| parent | Merge remote-tracking branches 'regulator/topic/s5m8767' and 'regulator/topic... (diff) | |
| download | kernel-qcow2-linux-e437b90026ac754a0f8b4fe44b844d12ce6162d1.tar.gz kernel-qcow2-linux-e437b90026ac754a0f8b4fe44b844d12ce6162d1.tar.xz kernel-qcow2-linux-e437b90026ac754a0f8b4fe44b844d12ce6162d1.zip | |
regulator: core: Remove duplicate copy of active-discharge parsing
Apparently due to a wrongly resolved merge conflict between two
branches, which contained the same commit, the commit contents
partially was added two times in a row.
This change reverts the latter wrong inclusion of commit 909f7ee0b5f3
("regulator: core: Add support for active-discharge configuration").
The first applied commit 670666b9e0af ("regulator: core: Add support
for active-discharge configuration") is not touched.
Signed-off-by: Vladimir Zapolskiy <vladimir_zapolskiy@mentor.com>
Cc: Laxman Dewangan <ldewangan@nvidia.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
| -rw-r--r-- | drivers/regulator/core.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index e0b764284773..1cff11205642 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c @@ -1150,17 +1150,6 @@ static int set_machine_constraints(struct regulator_dev *rdev, } } - if (rdev->constraints->active_discharge && ops->set_active_discharge) { - bool ad_state = (rdev->constraints->active_discharge == - REGULATOR_ACTIVE_DISCHARGE_ENABLE) ? true : false; - - ret = ops->set_active_discharge(rdev, ad_state); - if (ret < 0) { - rdev_err(rdev, "failed to set active discharge\n"); - return ret; - } - } - print_constraints(rdev); return 0; } |