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

Commit 565f9b07 authored by Bjorn Andersson's avatar Bjorn Andersson Committed by Mark Brown
Browse files

regulator: Remove support for optional supplies in the bulk API 



The patch was based on my missinterpretation of the API and only
accidentally worked for me. Let's clean it out to not confuse others.

This reverts commit 3ff3f518.

Signed-off-by: default avatarBjorn Andersson <bjorn.andersson@linaro.org>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 29b4817d

drivers/regulator/core.c

+2 −4
Original line number Diff line number Diff line
@@ -3483,10 +3483,8 @@ int regulator_bulk_get(struct device *dev, int num_consumers, 
		consumers[i].consumer = NULL;



	for (i = 0; i < num_consumers; i++) {

		consumers[i].consumer = _regulator_get(dev,

						       consumers[i].supply,

						       false,

						       !consumers[i].optional);

		consumers[i].consumer = regulator_get(dev,

						      consumers[i].supply);

		if (IS_ERR(consumers[i].consumer)) {

			ret = PTR_ERR(consumers[i].consumer);

			dev_err(dev, "Failed to get supply '%s': %d\n",

drivers/regulator/devres.c

+2 −5
Original line number Diff line number Diff line
@@ -164,11 +164,8 @@ int devm_regulator_bulk_get(struct device *dev, int num_consumers, 
		consumers[i].consumer = NULL;



	for (i = 0; i < num_consumers; i++) {

		consumers[i].consumer = _devm_regulator_get(dev,

							    consumers[i].supply,

							    consumers[i].optional ?

								OPTIONAL_GET :

								NORMAL_GET);

		consumers[i].consumer = devm_regulator_get(dev,

							   consumers[i].supply);

		if (IS_ERR(consumers[i].consumer)) {

			ret = PTR_ERR(consumers[i].consumer);

			dev_err(dev, "Failed to get supply '%s': %d\n",

include/linux/regulator/consumer.h

+0 −3
Original line number Diff line number Diff line
@@ -140,8 +140,6 @@ struct regulator; 
 *

 * @supply:   The name of the supply.  Initialised by the user before

 *            using the bulk regulator APIs.

 * @optional: The supply should be considered optional. Initialised by the user

 *            before using the bulk regulator APIs.

 * @consumer: The regulator consumer for the supply.  This will be managed

 *            by the bulk API.

 *
@@ -151,7 +149,6 @@ struct regulator; 
 */

struct regulator_bulk_data {

	const char *supply;

	bool optional;

	struct regulator *consumer;



	/* private: Internal use */