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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <1458849121-11242-1-git-send-email-vladimir_zapolskiy@mentor.com>
Date:	Thu, 24 Mar 2016 21:52:01 +0200
From:	Vladimir Zapolskiy <vladimir_zapolskiy@...tor.com>
To:	Mark Brown <broonie@...nel.org>,
	Liam Girdwood <lgirdwood@...il.com>
CC:	Laxman Dewangan <ldewangan@...dia.com>,
	<linux-kernel@...r.kernel.org>
Subject: [PATCH] Revert "regulator: core: Add support for active-discharge configuration"

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@...tor.com>
Cc: Laxman Dewangan <ldewangan@...dia.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