regulator: core: Add the opmode to regulator_summary

It's handy to know what opmode a regulator has been configured to in
the summary.  Add it.

Signed-off-by: Douglas Anderson <dianders@chromium.org>
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index bb1324f..69b64e5 100644 (file)
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -426,19 +426,24 @@ static ssize_t name_show(struct device *dev, struct device_attribute *attr,
 }
 static DEVICE_ATTR_RO(name);
 
-static ssize_t regulator_print_opmode(char *buf, int mode)
+static const char *regulator_opmode_to_str(int mode)
 {
        switch (mode) {
        case REGULATOR_MODE_FAST:
-               return sprintf(buf, "fast\n");
+               return "fast";
        case REGULATOR_MODE_NORMAL:
-               return sprintf(buf, "normal\n");
+               return "normal";
        case REGULATOR_MODE_IDLE:
-               return sprintf(buf, "idle\n");
+               return "idle";
        case REGULATOR_MODE_STANDBY:
-               return sprintf(buf, "standby\n");
+               return "standby";
        }
-       return sprintf(buf, "unknown\n");
+       return "unknown";
+}
+
+static ssize_t regulator_print_opmode(char *buf, int mode)
+{
+       return sprintf(buf, "%s\n", regulator_opmode_to_str(mode));
 }
 
 static ssize_t regulator_opmode_show(struct device *dev,
@@ -4674,10 +4679,11 @@ static void regulator_summary_show_subtree(struct seq_file *s,
        if (!rdev)
                return;
 
-       seq_printf(s, "%*s%-*s %3d %4d %6d ",
+       seq_printf(s, "%*s%-*s %3d %4d %6d %7s ",
                   level * 3 + 1, "",
                   30 - level * 3, rdev_get_name(rdev),
-                  rdev->use_count, rdev->open_count, rdev->bypass_count);
+                  rdev->use_count, rdev->open_count, rdev->bypass_count,
+                  regulator_opmode_to_str(_regulator_get_mode(rdev)));
 
        seq_printf(s, "%5dmV ", _regulator_get_voltage(rdev) / 1000);
        seq_printf(s, "%5dmA ", _regulator_get_current_limit(rdev) / 1000);
@@ -4709,7 +4715,7 @@ static void regulator_summary_show_subtree(struct seq_file *s,
 
                switch (rdev->desc->type) {
                case REGULATOR_VOLTAGE:
-                       seq_printf(s, "%37dmV %5dmV",
+                       seq_printf(s, "%45dmV %5dmV",
                                   consumer->voltage[PM_SUSPEND_ON].min_uV / 1000,
                                   consumer->voltage[PM_SUSPEND_ON].max_uV / 1000);
                        break;
@@ -4741,8 +4747,8 @@ static int regulator_summary_show_roots(struct device *dev, void *data)
 
 static int regulator_summary_show(struct seq_file *s, void *data)
 {
-       seq_puts(s, " regulator                      use open bypass voltage current     min     max\n");
-       seq_puts(s, "-------------------------------------------------------------------------------\n");
+       seq_puts(s, " regulator                      use open bypass  opmode voltage current     min     max\n");
+       seq_puts(s, "---------------------------------------------------------------------------------------\n");
 
        class_for_each_device(&regulator_class, NULL, s,
                              regulator_summary_show_roots);