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

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

regulator: Rename regulator_set_optimum_mode 



Rename the regulator_set_optimum_mode() function regulator_set_load() to
better represent what's going on.

Signed-off-by: default avatarBjorn Andersson <bjorn.andersson@sonymobile.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent c517d838

Documentation/power/regulator/consumer.txt

+1 −1
Original line number Diff line number Diff line
@@ -137,7 +137,7 @@ Indirect operating mode control. 
Consumer drivers can request a change in their supply regulator operating mode

by calling :-



int regulator_set_optimum_mode(struct regulator *regulator, int load_uA);

int regulator_set_load(struct regulator *regulator, int load_uA);



This will cause the core to recalculate the total load on the regulator (based

on all its consumers) and change operating mode (if necessary and permitted)

drivers/regulator/core.c

+4 −4
Original line number Diff line number Diff line
@@ -2994,7 +2994,7 @@ unsigned int regulator_get_mode(struct regulator *regulator) 
EXPORT_SYMBOL_GPL(regulator_get_mode);



/**

 * regulator_set_optimum_mode - set regulator optimum operating mode

 * regulator_set_load - set regulator load

 * @regulator: regulator source

 * @uA_load: load current

 *
@@ -3017,9 +3017,9 @@ EXPORT_SYMBOL_GPL(regulator_get_mode); 
 * DRMS will sum the total requested load on the regulator and change

 * to the most efficient operating mode if platform constraints allow.

 *

 * Returns the new regulator mode or error.

 * On error a negative errno is returned.

 */

int regulator_set_optimum_mode(struct regulator *regulator, int uA_load)

int regulator_set_load(struct regulator *regulator, int uA_load)

{

	struct regulator_dev *rdev = regulator->rdev;

	int ret;
@@ -3031,7 +3031,7 @@ int regulator_set_optimum_mode(struct regulator *regulator, int uA_load) 


	return ret;

}

EXPORT_SYMBOL_GPL(regulator_set_optimum_mode);

EXPORT_SYMBOL_GPL(regulator_set_load);



/**

 * regulator_allow_bypass - allow the regulator to go into bypass mode

include/linux/regulator/consumer.h

+9 −3
Original line number Diff line number Diff line
@@ -238,7 +238,7 @@ int regulator_get_current_limit(struct regulator *regulator); 


int regulator_set_mode(struct regulator *regulator, unsigned int mode);

unsigned int regulator_get_mode(struct regulator *regulator);

int regulator_set_optimum_mode(struct regulator *regulator, int load_uA);

int regulator_set_load(struct regulator *regulator, int load_uA);



int regulator_allow_bypass(struct regulator *regulator, bool allow);
@@ -479,8 +479,7 @@ static inline unsigned int regulator_get_mode(struct regulator *regulator) 
	return REGULATOR_MODE_NORMAL;

}



static inline int regulator_set_optimum_mode(struct regulator *regulator,

					int load_uA)

static inline int regulator_set_load(struct regulator *regulator, int load_uA)

{

	return REGULATOR_MODE_NORMAL;

}
@@ -555,4 +554,11 @@ static inline int regulator_is_supported_voltage_tol(struct regulator *regulator 
					      target_uV + tol_uV);

}



/* TEMP: Wrapper to keep bisectability */

static inline int regulator_set_optimum_mode(struct regulator *regulator,

					     int load_uA)

{

	return regulator_set_load(regulator, load_uA);

}



#endif