aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNishanth Menon <nm@ti.com>2012-10-25 14:37:16 -0400
committerKevin Hilman <khilman@ti.com>2012-10-25 17:32:34 -0400
commit9bb053787d5ca12ec388bb5f871c79ffb83762ab (patch)
treebfb5a346a29502d450f18f0d194773d9ad1b0720
parent6f0c0580b70c89094b3422ba81118c7b959c7556 (diff)
ARM: OMAP2+: PM: VP: minor pr_warn updates
change pr_warnings to pr_warn and ensure a newline is present in all messages Cc: linux-omap@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org Signed-off-by: Nishanth Menon <nm@ti.com> Signed-off-by: Kevin Hilman <khilman@ti.com>
-rw-r--r--arch/arm/mach-omap2/vp.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/arch/arm/mach-omap2/vp.c b/arch/arm/mach-omap2/vp.c
index 85241b828c02..6e9fe8574315 100644
--- a/arch/arm/mach-omap2/vp.c
+++ b/arch/arm/mach-omap2/vp.c
@@ -138,7 +138,7 @@ int omap_vp_forceupdate_scale(struct voltagedomain *voltdm,
138 udelay(1); 138 udelay(1);
139 } 139 }
140 if (timeout >= VP_TRANXDONE_TIMEOUT) { 140 if (timeout >= VP_TRANXDONE_TIMEOUT) {
141 pr_warn("%s: vdd_%s TRANXDONE timeout exceeded. Voltage change aborted", 141 pr_warn("%s: vdd_%s TRANXDONE timeout exceeded. Voltage change aborted\n",
142 __func__, voltdm->name); 142 __func__, voltdm->name);
143 return -ETIMEDOUT; 143 return -ETIMEDOUT;
144 } 144 }
@@ -197,7 +197,7 @@ void omap_vp_enable(struct voltagedomain *voltdm)
197 u32 vpconfig, volt; 197 u32 vpconfig, volt;
198 198
199 if (!voltdm || IS_ERR(voltdm)) { 199 if (!voltdm || IS_ERR(voltdm)) {
200 pr_warning("%s: VDD specified does not exist!\n", __func__); 200 pr_warn("%s: VDD specified does not exist!\n", __func__);
201 return; 201 return;
202 } 202 }
203 203
@@ -214,8 +214,8 @@ void omap_vp_enable(struct voltagedomain *voltdm)
214 214
215 volt = voltdm_get_voltage(voltdm); 215 volt = voltdm_get_voltage(voltdm);
216 if (!volt) { 216 if (!volt) {
217 pr_warning("%s: unable to find current voltage for %s\n", 217 pr_warn("%s: unable to find current voltage for %s\n",
218 __func__, voltdm->name); 218 __func__, voltdm->name);
219 return; 219 return;
220 } 220 }
221 221
@@ -242,7 +242,7 @@ void omap_vp_disable(struct voltagedomain *voltdm)
242 int timeout; 242 int timeout;
243 243
244 if (!voltdm || IS_ERR(voltdm)) { 244 if (!voltdm || IS_ERR(voltdm)) {
245 pr_warning("%s: VDD specified does not exist!\n", __func__); 245 pr_warn("%s: VDD specified does not exist!\n", __func__);
246 return; 246 return;
247 } 247 }
248 248
@@ -272,8 +272,7 @@ void omap_vp_disable(struct voltagedomain *voltdm)
272 VP_IDLE_TIMEOUT, timeout); 272 VP_IDLE_TIMEOUT, timeout);
273 273
274 if (timeout >= VP_IDLE_TIMEOUT) 274 if (timeout >= VP_IDLE_TIMEOUT)
275 pr_warning("%s: vdd_%s idle timedout\n", 275 pr_warn("%s: vdd_%s idle timedout\n", __func__, voltdm->name);
276 __func__, voltdm->name);
277 276
278 vp->enabled = false; 277 vp->enabled = false;
279 278