Merge remote-tracking branches 'regulator/topic/rk808', 'regulator/topic/rpm', 'regulator/topic/rt5033' and 'regulator/topic/tps65023' into regulator-next
This commit is contained in:
@@ -97,7 +97,7 @@ static int rk808_set_ramp_delay(struct regulator_dev *rdev, int ramp_delay)
|
||||
RK808_RAMP_RATE_MASK, ramp_value);
|
||||
}
|
||||
|
||||
int rk808_set_suspend_voltage(struct regulator_dev *rdev, int uv)
|
||||
static int rk808_set_suspend_voltage(struct regulator_dev *rdev, int uv)
|
||||
{
|
||||
unsigned int reg;
|
||||
int sel = regulator_map_voltage_linear_range(rdev, uv, uv);
|
||||
@@ -112,7 +112,7 @@ int rk808_set_suspend_voltage(struct regulator_dev *rdev, int uv)
|
||||
sel);
|
||||
}
|
||||
|
||||
int rk808_set_suspend_enable(struct regulator_dev *rdev)
|
||||
static int rk808_set_suspend_enable(struct regulator_dev *rdev)
|
||||
{
|
||||
unsigned int reg;
|
||||
|
||||
@@ -123,7 +123,7 @@ int rk808_set_suspend_enable(struct regulator_dev *rdev)
|
||||
0);
|
||||
}
|
||||
|
||||
int rk808_set_suspend_disable(struct regulator_dev *rdev)
|
||||
static int rk808_set_suspend_disable(struct regulator_dev *rdev)
|
||||
{
|
||||
unsigned int reg;
|
||||
|
||||
|
Reference in New Issue
Block a user