From be254436eb6fd41accd610aa1f3ce49697b48a36 Mon Sep 17 00:00:00 2001 From: Vladimir Zapolskiy Date: Thu, 24 Mar 2016 21:52:01 +0200 Subject: [PATCH] UPSTREAM: 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 Cc: Laxman Dewangan Signed-off-by: Mark Brown (cherry picked from commit e437b90026ac754a0f8b4fe44b844d12ce6162d1) Change-Id: Iaa7a0c0bb6b7cad7c33e02ac9d90c8e098ad8c18 Signed-off-by: David Wu --- drivers/regulator/core.c | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index f28fca4b68e3..55cf0f12b2a9 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c @@ -1148,17 +1148,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; } -- 2.34.1