diff options
Diffstat (limited to 'drivers/regulator/dbx500-prcmu.c')
-rw-r--r-- | drivers/regulator/dbx500-prcmu.c | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/drivers/regulator/dbx500-prcmu.c b/drivers/regulator/dbx500-prcmu.c index ce89f7848a57..2d16b9f16de7 100644 --- a/drivers/regulator/dbx500-prcmu.c +++ b/drivers/regulator/dbx500-prcmu.c | |||
@@ -78,6 +78,7 @@ static struct ux500_regulator_debug { | |||
78 | void ux500_regulator_suspend_debug(void) | 78 | void ux500_regulator_suspend_debug(void) |
79 | { | 79 | { |
80 | int i; | 80 | int i; |
81 | |||
81 | for (i = 0; i < rdebug.num_regulators; i++) | 82 | for (i = 0; i < rdebug.num_regulators; i++) |
82 | rdebug.state_before_suspend[i] = | 83 | rdebug.state_before_suspend[i] = |
83 | rdebug.regulator_array[i].is_enabled; | 84 | rdebug.regulator_array[i].is_enabled; |
@@ -86,6 +87,7 @@ void ux500_regulator_suspend_debug(void) | |||
86 | void ux500_regulator_resume_debug(void) | 87 | void ux500_regulator_resume_debug(void) |
87 | { | 88 | { |
88 | int i; | 89 | int i; |
90 | |||
89 | for (i = 0; i < rdebug.num_regulators; i++) | 91 | for (i = 0; i < rdebug.num_regulators; i++) |
90 | rdebug.state_after_suspend[i] = | 92 | rdebug.state_after_suspend[i] = |
91 | rdebug.regulator_array[i].is_enabled; | 93 | rdebug.regulator_array[i].is_enabled; |
@@ -127,9 +129,9 @@ static int ux500_regulator_status_print(struct seq_file *s, void *p) | |||
127 | int i; | 129 | int i; |
128 | 130 | ||
129 | /* print dump header */ | 131 | /* print dump header */ |
130 | err = seq_printf(s, "ux500-regulator status:\n"); | 132 | err = seq_puts(s, "ux500-regulator status:\n"); |
131 | if (err < 0) | 133 | if (err < 0) |
132 | dev_err(dev, "seq_printf overflow\n"); | 134 | dev_err(dev, "seq_puts overflow\n"); |
133 | 135 | ||
134 | err = seq_printf(s, "%31s : %8s : %8s\n", "current", | 136 | err = seq_printf(s, "%31s : %8s : %8s\n", "current", |
135 | "before", "after"); | 137 | "before", "after"); |
@@ -202,18 +204,12 @@ ux500_regulator_debug_init(struct platform_device *pdev, | |||
202 | rdebug.num_regulators = num_regulators; | 204 | rdebug.num_regulators = num_regulators; |
203 | 205 | ||
204 | rdebug.state_before_suspend = kzalloc(num_regulators, GFP_KERNEL); | 206 | rdebug.state_before_suspend = kzalloc(num_regulators, GFP_KERNEL); |
205 | if (!rdebug.state_before_suspend) { | 207 | if (!rdebug.state_before_suspend) |
206 | dev_err(&pdev->dev, | ||
207 | "could not allocate memory for saving state\n"); | ||
208 | goto exit_destroy_power_state; | 208 | goto exit_destroy_power_state; |
209 | } | ||
210 | 209 | ||
211 | rdebug.state_after_suspend = kzalloc(num_regulators, GFP_KERNEL); | 210 | rdebug.state_after_suspend = kzalloc(num_regulators, GFP_KERNEL); |
212 | if (!rdebug.state_after_suspend) { | 211 | if (!rdebug.state_after_suspend) |
213 | dev_err(&pdev->dev, | ||
214 | "could not allocate memory for saving state\n"); | ||
215 | goto exit_free; | 212 | goto exit_free; |
216 | } | ||
217 | 213 | ||
218 | dbx500_regulator_testcase(regulator_info, num_regulators); | 214 | dbx500_regulator_testcase(regulator_info, num_regulators); |
219 | return 0; | 215 | return 0; |