mirror of
https://github.com/FEX-Emu/linux.git
synced 2025-01-11 11:56:48 +00:00
Merge remote-tracking branch 'regulator/topic/core' into regulator-next
This commit is contained in:
commit
6b46856246
@ -204,7 +204,7 @@ static struct device_node *of_get_regulator(struct device *dev, const char *supp
|
||||
regnode = of_parse_phandle(dev->of_node, prop_name, 0);
|
||||
|
||||
if (!regnode) {
|
||||
dev_dbg(dev, "Looking up %s property in node %s failed",
|
||||
dev_dbg(dev, "Looking up %s property in node %s failed\n",
|
||||
prop_name, dev->of_node->full_name);
|
||||
return NULL;
|
||||
}
|
||||
@ -293,7 +293,8 @@ static int regulator_check_current_limit(struct regulator_dev *rdev,
|
||||
}
|
||||
|
||||
/* operating mode constraint check */
|
||||
static int regulator_mode_constrain(struct regulator_dev *rdev, int *mode)
|
||||
static int regulator_mode_constrain(struct regulator_dev *rdev,
|
||||
unsigned int *mode)
|
||||
{
|
||||
switch (*mode) {
|
||||
case REGULATOR_MODE_FAST:
|
||||
|
Loading…
x
Reference in New Issue
Block a user