From: Mark Brown <broonie@kernel.org>
Date: Sun, 8 Feb 2015 03:16:27 +0000 (+0800)
Subject: Merge remote-tracking branches 'regulator/topic/max8649', 'regulator/topic/mode'... 
X-Git-Tag: v4.0-rc1~166^2~1
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=ffe167b0f2debbb3e21d2094508f8caca5a5bd8e;p=linux-block.git

Merge remote-tracking branches 'regulator/topic/max8649', 'regulator/topic/mode', 'regulator/topic/mt6397', 'regulator/topic/pfuze100' and 'regulator/topic/qcom-rpm' into regulator-next
---

ffe167b0f2debbb3e21d2094508f8caca5a5bd8e
diff --cc drivers/regulator/core.c
index e607bafa7c09,e225711bb8bc,0e0d8297dc8e,e225711bb8bc,e225711bb8bc,e225711bb8bc..b899947d839d
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@@@@@@ -632,9 -632,33 -632,33 -632,33 -632,33 -632,33 +632,9 @@@@@@@ static ssize_t regulator_bypass_show(st
      static DEVICE_ATTR(bypass, 0444,
      		   regulator_bypass_show, NULL);
      
 -----/*
 ----- * These are the only attributes are present for all regulators.
 ----- * Other attributes are a function of regulator functionality.
 ----- */
 -----static struct attribute *regulator_dev_attrs[] = {
 -----	&dev_attr_name.attr,
 -----	&dev_attr_num_users.attr,
 -----	&dev_attr_type.attr,
 -----	NULL,
 -----};
 -----ATTRIBUTE_GROUPS(regulator_dev);
 -----
 -----static void regulator_dev_release(struct device *dev)
 -----{
 -----	struct regulator_dev *rdev = dev_get_drvdata(dev);
 -----	kfree(rdev);
 -----}
 -----
 -----static struct class regulator_class = {
 -----	.name = "regulator",
 -----	.dev_release = regulator_dev_release,
 -----	.dev_groups = regulator_dev_groups,
 -----};
 -----
      /* Calculate the new optimum regulator operating mode based on the new total
       * consumer load. All locks held by caller */
-- ---static void drms_uA_update(struct regulator_dev *rdev)
++ +++static int drms_uA_update(struct regulator_dev *rdev)
      {
      	struct regulator *sibling;
      	int current_uA = 0, output_uV, input_uV, err;