ARM: OMAP2+: PM: add missing newline to VC warning message

PATCH New Kevin Hilman 3 participants 4 messages Oct 25, 2012

Subsystems (3)

Arm (32-bit) Arm sub-architectures OMAP2+ support

lore

Share & tools

lore

Kevin Hilman

author

2012-10-25 17:35 UTC #0 lore raw

PATCH 1/1 ARM: OMAP2+: PM: add missing newline to VC warning message

From: Kevin Hilman <[email protected]>

Add missing newline to warning message to avoid annoying wrapping problems during kernel boot like this one:

omap_vc_i2c_init: I2C config for vdd_iva does not match other channels (0).
omap_vc_i2c_init: I2C config for vdd_mpu does not match other channels (0).Power Management for TI OMAP4.

Reported-by Russell King <[email protected]>

Signed-off-by Kevin Hilman <[email protected]>

---
 arch/arm/mach-omap2/vc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

arch/arm/mach-omap2/vc.c +1 -1

index 880249b..75878c3 100644
@@ -264,7 +264,7 @@ static void __init omap_vc_i2c_init(struct voltagedomain *voltdm)
 
 	if (initialized) {
 		if (voltdm->pmic->i2c_high_speed != i2c_high_speed)
-			pr_warn("%s: I2C config for vdd_%s does not match other channels (%u).",
+			pr_warn("%s: I2C config for vdd_%s does not match other channels (%u).\n",
 				__func__, voltdm->name, i2c_high_speed);
 		return;
 	}

Signature · 1 line

1.8.0

Nishanth Menon

2012-10-25 17:56 UTC #1 lore raw

PATCH 1/1 ARM: OMAP2+: PM: add missing newline to VC warning message

Quoted 19 lines · Kevin Hilman

From: Kevin Hilman <[email protected]>
Add missing newline to warning message to avoid annoying wrapping problems during kernel boot like this one:
omap_vc_i2c_init: I2C config for vdd_iva does not match other channels (0).
omap_vc_i2c_init: I2C config for vdd_mpu does not match other channels (0).Power Management for TI OMAP4.
Reported-by Russell King <[email protected]>
Signed-off-by Kevin Hilman <[email protected]>
---
 arch/arm/mach-omap2/vc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/mach-omap2/vc.c +0 -0
index 880249b..75878c3 100644

arch/arm/mach-omap2/vc.c static void __init omap_vc_i2c_init(struct voltagedomain *voltdm) · line 270

Quoted 8 lines

arch/arm/mach-omap2/vc.c +1 -1

@@ -264,7 +264,7 @@ static void __init omap_vc_i2c_init(struct voltagedomain *voltdm)
 
 	if (initialized) {
 		if (voltdm->pmic->i2c_high_speed != i2c_high_speed)
-			pr_warn("%s: I2C config for vdd_%s does not match other channels (%u).",
+			pr_warn("%s: I2C config for vdd_%s does not match other channels (%u).\n",
 				__func__, voltdm->name, i2c_high_speed);
 		return;
 	}

Acked-by Nishanth Menon <[email protected]>

while we are at it, could we clean up the pr_warning usage back to pr_warn as well?

arch/arm/mach-omap2/vc.c +1 -1

index 880249b..2d66f8c 100644
@@ -186,7 +186,7 @@ int omap_vc_bypass_scale(struct voltagedomain *voltdm,
 		loop_cnt++;
 
 		if (retries_cnt > 10) {
-			pr_warning("%s: Retry count exceeded\n", __func__);
+			pr_warn("%s: Retry count exceeded\n", __func__);
 			return -ETIMEDOUT;
 		}

Signature · 2 lines

Regards,
Nishanth Menon

Tony Lindgren

maintainer

2012-10-25 22:12 UTC #2 lore raw

PATCH 1/1 ARM: OMAP2+: PM: add missing newline to VC warning message

Quoted 21 lines · Nishanth Menon

Quoted 20 lines · Kevin Hilman
From: Kevin Hilman <[email protected]>
Add missing newline to warning message to avoid annoying wrapping problems during kernel boot like this one:
omap_vc_i2c_init: I2C config for vdd_iva does not match other channels (0).
omap_vc_i2c_init: I2C config for vdd_mpu does not match other channels (0).Power Management for TI OMAP4.
Reported-by Russell King <[email protected]>
Signed-off-by Kevin Hilman <[email protected]>
---
 arch/arm/mach-omap2/vc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/mach-omap2/vc.c +0 -0
index 880249b..75878c3 100644
@@ -264,7 +264,7 @@ static void __init omap_vc_i2c_init(struct voltagedomain *voltdm)
 

Quoted 8 lines

arch/arm/mach-omap2/vc.c static void __init omap_vc_i2c_init(struct voltagedomain *voltdm) · line 270
Quoted 7 lines
arch/arm/mach-omap2/vc.c +1 -1
 	if (initialized) {
 		if (voltdm->pmic->i2c_high_speed != i2c_high_speed)
-			pr_warn("%s: I2C config for vdd_%s does not match other channels (%u).",
+			pr_warn("%s: I2C config for vdd_%s does not match other channels (%u).\n",
 				__func__, voltdm->name, i2c_high_speed);
 		return;
 	}
Acked-by Nishanth Menon <[email protected]>

Thanks I'll apply this into omap-for-v3.7-rc2/fixes-part2-take2.

Quoted 7 lines

while we are at it, could we clean up the pr_warning usage back to pr_warn as well?
arch/arm/mach-omap2/vc.c +0 -0
index 880249b..2d66f8c 100644

arch/arm/mach-omap2/vc.c int omap_vc_bypass_scale(struct voltagedomain *voltdm, · line 192

Quoted 8 lines

arch/arm/mach-omap2/vc.c +1 -1

@@ -186,7 +186,7 @@ int omap_vc_bypass_scale(struct voltagedomain *voltdm,
 		loop_cnt++;
 
 		if (retries_cnt > 10) {
-			pr_warning("%s: Retry count exceeded\n", __func__);
+			pr_warn("%s: Retry count exceeded\n", __func__);
 			return -ETIMEDOUT;
 		}

Looks like that's in the separate patch you posted for v3.8 that Kevin is taking.

Regards,

Tony

Nishanth Menon

2012-10-25 22:27 UTC #3 lore raw

PATCH 1/1 ARM: OMAP2+: PM: add missing newline to VC warning message

Quoted 3 lines · Tony Lindgren

Quoted 2 lines · Nishanth Menon
Quoted 1 line · Kevin Hilman
From: Kevin Hilman <[email protected]>

[..]

Quoted 9 lines

Quoted 9 lines
while we are at it, could we clean up the pr_warning usage back to pr_warn as well?
arch/arm/mach-omap2/vc.c +0 -0
index 880249b..2d66f8c 100644
@@ -186,7 +186,7 @@ int omap_vc_bypass_scale(struct voltagedomain *voltdm,
 		loop_cnt++;
 

Quoted 9 lines

arch/arm/mach-omap2/vc.c int omap_vc_bypass_scale(struct voltagedomain *voltdm, · line 192
Quoted 6 lines
arch/arm/mach-omap2/vc.c +1 -1
 		if (retries_cnt > 10) {
-			pr_warning("%s: Retry count exceeded\n", __func__);
+			pr_warn("%s: Retry count exceeded\n", __func__);
 			return -ETIMEDOUT;
 		}
 
Looks like that's in the separate patch you posted for v3.8 that Kevin is taking.

Nope. if you indicated [1], then I got inspired by Kevin's cleanup and cleaned up vp.c -> Kevin cleaned up vc.c :)

If the additional cleanup I pointed above in this thread is interesting, it could be clubbed with the current patch itself

[1] https://patchwork.kernel.org/patch/1646661/

Signature · 2 lines

Regards,
Nishanth Menon