UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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 3ff3f518a1.

Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Bjorn Andersson 2016-08-16 11:50:32 -07:00 committed by Mark Brown
parent 29b4817d40
commit 565f9b073f
3 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/regulator/core.c
View File

@ -3483,10 +3483,8 @@ int regulator_bulk_get(struct device *dev, int num_consumers,
consumers[i].consumer = NULL; consumers[i].consumer = NULL;
for (i = 0; i < num_consumers; i++) { for (i = 0; i < num_consumers; i++) {
consumers[i].consumer = _regulator_get(dev, consumers[i].consumer = regulator_get(dev,
consumers[i].supply, consumers[i].supply);
false,
!consumers[i].optional);
if (IS_ERR(consumers[i].consumer)) { if (IS_ERR(consumers[i].consumer)) {
ret = PTR_ERR(consumers[i].consumer); ret = PTR_ERR(consumers[i].consumer);
dev_err(dev, "Failed to get supply '%s': %d\n", dev_err(dev, "Failed to get supply '%s': %d\n",

7
drivers/regulator/devres.c
View File

@ -164,11 +164,8 @@ int devm_regulator_bulk_get(struct device *dev, int num_consumers,
consumers[i].consumer = NULL; consumers[i].consumer = NULL;
for (i = 0; i < num_consumers; i++) { for (i = 0; i < num_consumers; i++) {
consumers[i].consumer = _devm_regulator_get(dev, consumers[i].consumer = devm_regulator_get(dev,
consumers[i].supply, consumers[i].supply);
consumers[i].optional ?
OPTIONAL_GET :
NORMAL_GET);
if (IS_ERR(consumers[i].consumer)) { if (IS_ERR(consumers[i].consumer)) {
ret = PTR_ERR(consumers[i].consumer); ret = PTR_ERR(consumers[i].consumer);
dev_err(dev, "Failed to get supply '%s': %d\n", dev_err(dev, "Failed to get supply '%s': %d\n",

3
include/linux/regulator/consumer.h
View File

@ -140,8 +140,6 @@ struct regulator;
* *
* @supply: The name of the supply. Initialised by the user before * @supply: The name of the supply. Initialised by the user before
* using the bulk regulator APIs. * 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 * @consumer: The regulator consumer for the supply. This will be managed
* by the bulk API. * by the bulk API.
* *
@ -151,7 +149,6 @@ struct regulator;
*/ */
struct regulator_bulk_data { struct regulator_bulk_data {
const char *supply; const char *supply;
bool optional;
struct regulator *consumer; struct regulator *consumer;
/* private: Internal use */ /* private: Internal use */