Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e437b900 authored by Vladimir Zapolskiy's avatar Vladimir Zapolskiy Committed by Mark Brown
Browse files

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 909f7ee0
("regulator: core: Add support for active-discharge configuration").

The first applied commit 670666b9 ("regulator: core: Add support
for active-discharge configuration") is not touched.

Signed-off-by: default avatarVladimir Zapolskiy <vladimir_zapolskiy@mentor.com>
Cc: Laxman Dewangan <ldewangan@nvidia.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 768e6668

drivers/regulator/core.c

+0 −11
Original line number Diff line number Diff line
@@ -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;

}