Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1364419

[PATCH] Revert "regulator: core: Add support for active-discharge configuration"

Show all headers | View raw

This reverts commit 909f7ee0b5f30f735e16864a7ed18d2e6123e6d9.

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>
---
 drivers/regulator/core.c | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index e0b7642..1cff112 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;
 }
-- 
2.5.0

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH] Revert "regulator: core: Add support for active-discharge configuration" Vladimir Zapolskiy <vladimir_zapolskiy@mentor.com> - 2016-03-24 21:00 +0100
  Re: [PATCH] Revert "regulator: core: Add support for  active-discharge configuration" Mark Brown <broonie@kernel.org> - 2016-03-25 12:20 +0100
    Re: [PATCH] Revert "regulator: core: Add support for active-discharge  configuration" Vladimir Zapolskiy <vladimir_zapolskiy@mentor.com> - 2016-03-25 13:40 +0100
      Re: [PATCH] Revert "regulator: core: Add support for  active-discharge configuration" Mark Brown <broonie@kernel.org> - 2016-03-25 16:00 +0100
    Re: [PATCH] Revert "regulator: core: Add support for active-discharge  configuration" Vladimir Zapolskiy <vladimir_zapolskiy@mentor.com> - 2016-03-25 16:00 +0100
      Re: [PATCH] Revert "regulator: core: Add support for  active-discharge configuration" Mark Brown <broonie@kernel.org> - 2016-03-25 16:50 +0100
        Re: [PATCH] Revert "regulator: core: Add support for active-discharge  configuration" Vladimir Zapolskiy <vladimir_zapolskiy@mentor.com> - 2016-03-25 18:10 +0100
          Re: [PATCH] Revert "regulator: core: Add support for  active-discharge configuration" Mark Brown <broonie@kernel.org> - 2016-03-25 19:20 +0100
  Applied "regulator: core: Remove duplicate copy of active-discharge parsing" to the regulator tree Mark Brown <broonie@kernel.org> - 2016-03-25 17:50 +0100

csiph-web