Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6: (32 commits)
  regulator: twl4030 VAUX3 supports 3.0V
  regulator: Support disabling of unused regulators by machines
  regulator: Don't increment use_count for boot_on regulators
  twl4030-regulator: expose VPLL2
  regulator: refcount fixes
  regulator: Don't warn if we failed to get a regulator
  regulator: Allow boot_on regulators to be disabled by clients
  regulator: Implement list_voltage for WM835x LDOs and DCDCs
  twl4030-regulator: list more VAUX4 voltages
  regulator: Don't warn on omitted voltage constraints
  regulator: Implement list_voltage() for WM8400 DCDCs and LDOs
  MMC: regulator utilities
  regulator: twl4030 voltage enumeration (v2)
  regulator: twl4030 regulators
  regulator: get_status() grows kerneldoc
  regulator: enumerate voltages (v2)
  regulator: Fix get_mode() for WM835x DCDCs
  regulator: Allow regulators to set the initial operating mode
  regulator: Suggest use of datasheet supply or pin names for consumers
  regulator: email - update email address and regulator webpage.
  ...

1 files changed, 9 insertions, 5 deletions

diff --git a/drivers/regulator/virtual.c b/drivers/regulator/virtual.c
index 5ddb464b1c3f..3d08348584e1 100644
--- a/drivers/regulator/virtual.c
+++ b/drivers/regulator/virtual.c
@@ -226,13 +226,17 @@ static ssize_t set_mode(struct device *dev, struct device_attribute *attr,
         unsigned int mode;
         int ret;
 
-        if (strncmp(buf, "fast", strlen("fast")) == 0)
+        /*
+         * sysfs_streq() doesn't need the \n's, but we add them so the strings
+         * will be shared with show_mode(), above.
+         */
+        if (sysfs_streq(buf, "fast\n") == 0)
                 mode = REGULATOR_MODE_FAST;
-        else if (strncmp(buf, "normal", strlen("normal")) == 0)
+        else if (sysfs_streq(buf, "normal\n") == 0)
                 mode = REGULATOR_MODE_NORMAL;
-        else if (strncmp(buf, "idle", strlen("idle")) == 0)
+        else if (sysfs_streq(buf, "idle\n") == 0)
                 mode = REGULATOR_MODE_IDLE;
-        else if (strncmp(buf, "standby", strlen("standby")) == 0)
+        else if (sysfs_streq(buf, "standby\n") == 0)
                 mode = REGULATOR_MODE_STANDBY;
         else {
                 dev_err(dev, "Configuring invalid mode\n");
@@ -256,7 +260,7 @@ static DEVICE_ATTR(min_microamps, 0666, show_min_uA, set_min_uA);
 static DEVICE_ATTR(max_microamps, 0666, show_max_uA, set_max_uA);
 static DEVICE_ATTR(mode, 0666, show_mode, set_mode);
 
-struct device_attribute *attributes[] = {
+static struct device_attribute *attributes[] = {
         &dev_attr_min_microvolts,
         &dev_attr_max_microvolts,
         &dev_attr_min_microamps,