Merge remote-tracking branches 'regulator/topic/s5m8767', 'regulator/topic/st-pwm...

[karo-tx-linux.git] / drivers / regulator / dbx500-prcmu.c

diff --git a/drivers/regulator/dbx500-prcmu.c b/drivers/regulator/dbx500-prcmu.c
index ce89f7848a57f00d58c6f879cb2b3157d28fd303..2d16b9f16de73f5ce42ffb2370bba98c9bccf20b 100644 (file)
--- a/drivers/regulator/dbx500-prcmu.c
+++ b/drivers/regulator/dbx500-prcmu.c
@@ -78,6 +78,7 @@ static struct ux500_regulator_debug {
 void ux500_regulator_suspend_debug(void)
 {
        int i;
+
        for (i = 0; i < rdebug.num_regulators; i++)
                rdebug.state_before_suspend[i] =
                        rdebug.regulator_array[i].is_enabled;
@@ -86,6 +87,7 @@ void ux500_regulator_suspend_debug(void)
 void ux500_regulator_resume_debug(void)
 {
        int i;
+
        for (i = 0; i < rdebug.num_regulators; i++)
                rdebug.state_after_suspend[i] =
                        rdebug.regulator_array[i].is_enabled;
@@ -127,9 +129,9 @@ static int ux500_regulator_status_print(struct seq_file *s, void *p)
        int i;
 
        /* print dump header */
-       err = seq_printf(s, "ux500-regulator status:\n");
+       err = seq_puts(s, "ux500-regulator status:\n");
        if (err < 0)
-               dev_err(dev, "seq_printf overflow\n");
+               dev_err(dev, "seq_puts overflow\n");
 
        err = seq_printf(s, "%31s : %8s : %8s\n", "current",
                "before", "after");
@@ -202,18 +204,12 @@ ux500_regulator_debug_init(struct platform_device *pdev,
        rdebug.num_regulators = num_regulators;
 
        rdebug.state_before_suspend = kzalloc(num_regulators, GFP_KERNEL);
-       if (!rdebug.state_before_suspend) {
-               dev_err(&pdev->dev,
-                       "could not allocate memory for saving state\n");
+       if (!rdebug.state_before_suspend)
                goto exit_destroy_power_state;
-       }
 
        rdebug.state_after_suspend = kzalloc(num_regulators, GFP_KERNEL);
-       if (!rdebug.state_after_suspend) {
-               dev_err(&pdev->dev,
-                       "could not allocate memory for saving state\n");
+       if (!rdebug.state_after_suspend)
                goto exit_free;
-       }
 
        dbx500_regulator_testcase(regulator_info, num_regulators);
        return 0;