Merge remote-tracking branch 'regulator/topic/core' into regulator-next

diff --combined drivers/regulator/core.c
index 5c1519b229e0e5cd718e4694cf0b27cde1c73f6d,cf23b1e2ac4c46d4e9fa2cc50cda798eb298ee0f..ee13c47addf1b76cb96917c63739d2cb1ff096a1
--- 1/drivers/regulator/core.c
--- 2/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@@ -204,7 -204,7 +204,7 @@@ static struct device_node *of_get_regul
        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 +293,8 @@@ static int regulator_check_current_limi
  }
  
  /* 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:
@@@ -2754,7 -2755,7 +2755,7 @@@ static int _regulator_set_voltage_time(
                ramp_delay = rdev->desc->ramp_delay;
  
        if (ramp_delay == 0) {
 -              rdev_warn(rdev, "ramp_delay not set\n");
 +              rdev_dbg(rdev, "ramp_delay not set\n");
                return 0;
        }