Drop \r\n and \n\r as both print_XXX and printk now do this internally.

Only some assembler files still have \r\n ... Can we move that part to C
completely?

Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>



git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5342 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

8 files changed, 16 insertions, 16 deletions

diff --git a/src/superio/ite/it8716f/superio.c b/src/superio/ite/it8716f/superio.c
index e4ba7b4a55..fbc9185a1b 100644
--- a/src/superio/ite/it8716f/superio.c
+++ b/src/superio/ite/it8716f/superio.c
@@ -72,13 +72,13 @@ static void init_ec(uint16_t base)
 
 	/* Read out current value of FAN_CTL control register (0x14). */
 	value = pnp_read_index(base, 0x14);
-	printk(BIOS_DEBUG, "FAN_CTL: reg = 0x%04x, read value = 0x%02x\r\n",
+	printk(BIOS_DEBUG, "FAN_CTL: reg = 0x%04x, read value = 0x%02x\n",
 		     base + 0x14, value);
 
 	/* Set FAN_CTL control register (0x14) polarity to high, and
 	   activate fans 1, 2 and 3. */
 	pnp_write_index(base, 0x14, value | 0x87);
-	printk(BIOS_DEBUG, "FAN_CTL: reg = 0x%04x, writing value = 0x%02x\r\n",
+	printk(BIOS_DEBUG, "FAN_CTL: reg = 0x%04x, writing value = 0x%02x\n",
 		     base + 0x14, value | 0x87);
 }
 #endif
diff --git a/src/superio/serverengines/pilot/pilot_early_init.c b/src/superio/serverengines/pilot/pilot_early_init.c
index b5013ef306..08aa5a7624 100644
--- a/src/superio/serverengines/pilot/pilot_early_init.c
+++ b/src/superio/serverengines/pilot/pilot_early_init.c
@@ -33,9 +33,9 @@ static void pilot_early_init(device_t dev)
 
 	print_debug("Using port: ");
 	print_debug_hex16(port);
-	print_debug("\r\n");
+	print_debug("\n");
 	pilot_disable_serial(PNP_DEV(port, 0x1));
-	print_debug("disable serial 1\r\n");
+	print_debug("disable serial 1\n");
 
 /*
 	pnp_enter_ext_func_mode(dev);
diff --git a/src/superio/smsc/lpc47b272/superio.c b/src/superio/smsc/lpc47b272/superio.c
index 61ee12eaba..9756d36de7 100644
--- a/src/superio/smsc/lpc47b272/superio.c
+++ b/src/superio/smsc/lpc47b272/superio.c
@@ -195,7 +195,7 @@ static void pnp_exit_conf_state(device_t dev)
 static void dump_pnp_device(device_t dev)
 {
 	int register_index;
-	print_debug("\r\n");
+	print_debug("\n");
 
 	for(register_index = 0; register_index <= LPC47B272_MAX_CONFIG_REGISTER; register_index++) {
 		uint8_t register_value;
@@ -214,10 +214,10 @@ static void dump_pnp_device(device_t dev)
 		print_debug_char(' ');
 		print_debug_hex8(register_value);
 		if ((register_index & 0x0f) == 0x0f) {
-			print_debug("\r\n");
+			print_debug("\n");
 		}
 	}
 
-   	print_debug("\r\n");
+   	print_debug("\n");
 }
 #endif
diff --git a/src/superio/smsc/lpc47b397/superio.c b/src/superio/smsc/lpc47b397/superio.c
index 29826aa860..9df7ee9dc5 100644
--- a/src/superio/smsc/lpc47b397/superio.c
+++ b/src/superio/smsc/lpc47b397/superio.c
@@ -106,7 +106,7 @@ static void lpc47b397_pnp_enable_resources(device_t dev)
 
 	switch(dev->path.pnp.device) {
 	case LPC47B397_HWM:
-		printk(BIOS_DEBUG, "lpc47b397 SensorBus Register Access enabled\r\n");
+		printk(BIOS_DEBUG, "lpc47b397 SensorBus Register Access enabled\n");
 		pnp_set_logical_device(dev);
 		enable_hwm_smbus(dev);
 		break;
diff --git a/src/superio/smsc/lpc47m10x/superio.c b/src/superio/smsc/lpc47m10x/superio.c
index 916590d4cf..001ac165dd 100644
--- a/src/superio/smsc/lpc47m10x/superio.c
+++ b/src/superio/smsc/lpc47m10x/superio.c
@@ -193,7 +193,7 @@ static void pnp_exit_conf_state(device_t dev)
 static void dump_pnp_device(device_t dev)
 {
 	int register_index;
-	print_debug("\r\n");
+	print_debug("\n");
 
 	for(register_index = 0; register_index <= LPC47M10X2_MAX_CONFIG_REGISTER; register_index++) {
 		uint8_t register_value;
@@ -212,10 +212,10 @@ static void dump_pnp_device(device_t dev)
 		print_debug_char(' ');
 		print_debug_hex8(register_value);
 		if ((register_index & 0x0f) == 0x0f) {
-			print_debug("\r\n");
+			print_debug("\n");
 		}
 	}
 
-   	print_debug("\r\n");
+   	print_debug("\n");
 }
 #endif
diff --git a/src/superio/smsc/lpc47n217/superio.c b/src/superio/smsc/lpc47n217/superio.c
index 4e6e6dcee9..cd4b539795 100644
--- a/src/superio/smsc/lpc47n217/superio.c
+++ b/src/superio/smsc/lpc47n217/superio.c
@@ -361,7 +361,7 @@ static void pnp_exit_conf_state(device_t dev)
 static void dump_pnp_device(device_t dev)
 {
 	int register_index;
-	print_debug("\r\n");
+	print_debug("\n");
 
 	for(register_index = 0; register_index <= LPC47N217_MAX_CONFIG_REGISTER; register_index++) {
 		uint8_t register_value;
@@ -380,10 +380,10 @@ static void dump_pnp_device(device_t dev)
 		print_debug_char(' ');
 		print_debug_hex8(register_value);
 		if ((register_index & 0x0f) == 0x0f) {
-			print_debug("\r\n");
+			print_debug("\n");
 		}
 	}
 
-   	print_debug("\r\n");
+   	print_debug("\n");
 }
 #endif
diff --git a/src/superio/winbond/w83627ehg/superio.c b/src/superio/winbond/w83627ehg/superio.c
index 8deae4a683..45410d1ff4 100644
--- a/src/superio/winbond/w83627ehg/superio.c
+++ b/src/superio/winbond/w83627ehg/superio.c
@@ -100,7 +100,7 @@ static void init_hwm(unsigned long base)
 		value = pnp_read_index(base, reg);
 		value &= 0xff & (~(hwm_reg_values[i + 1]));
 		value |= 0xff & hwm_reg_values[i + 2];
-		/* printk(BIOS_DEBUG, "base = 0x%04x, reg = 0x%02x, value = 0x%02x\r\n", base, reg,value); */
+		/* printk(BIOS_DEBUG, "base = 0x%04x, reg = 0x%02x, value = 0x%02x\n", base, reg,value); */
 		pnp_write_index(base, reg, value);
 	}
 }
diff --git a/src/superio/winbond/w83627hf/superio.c b/src/superio/winbond/w83627hf/superio.c
index 7c470ae8a2..4c69a2c2c0 100644
--- a/src/superio/winbond/w83627hf/superio.c
+++ b/src/superio/winbond/w83627hf/superio.c
@@ -120,7 +120,7 @@ static void init_hwm(unsigned long base)
 		value &= 0xff & hwm_reg_values[i+1];
 		value |= 0xff & hwm_reg_values[i+2];
 #if 0
-		printk(BIOS_DEBUG, "base = 0x%04x, reg = 0x%02x, value = 0x%02x\r\n", base, reg,value);
+		printk(BIOS_DEBUG, "base = 0x%04x, reg = 0x%02x, value = 0x%02x\n", base, reg,value);
 #endif
 		pnp_write_index(base, reg, value);
 	}