Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751484AbcCXTwM (ORCPT ); Thu, 24 Mar 2016 15:52:12 -0400 Received: from relay1.mentorg.com ([192.94.38.131]:43228 "EHLO relay1.mentorg.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751105AbcCXTwL (ORCPT ); Thu, 24 Mar 2016 15:52:11 -0400 From: Vladimir Zapolskiy To: Mark Brown , Liam Girdwood CC: Laxman Dewangan , Subject: [PATCH] Revert "regulator: core: Add support for active-discharge configuration" Date: Thu, 24 Mar 2016 21:52:01 +0200 Message-ID: <1458849121-11242-1-git-send-email-vladimir_zapolskiy@mentor.com> X-Mailer: git-send-email 2.5.0 MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [137.202.0.76] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1339 Lines: 42 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 Cc: Laxman Dewangan --- 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