printk_foo -> printk(BIOS_FOO, ...)

Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Ronald G. Minnich <rminnich@gmail.com>



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

9 files changed, 19 insertions, 19 deletions

diff --git a/src/superio/ite/it8716f/superio.c b/src/superio/ite/it8716f/superio.c
index 6744850740..e4ba7b4a55 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_debug("FAN_CTL: reg = 0x%04x, read value = 0x%02x\r\n",
+	printk(BIOS_DEBUG, "FAN_CTL: reg = 0x%04x, read value = 0x%02x\r\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_debug("FAN_CTL: reg = 0x%04x, writing value = 0x%02x\r\n",
+	printk(BIOS_DEBUG, "FAN_CTL: reg = 0x%04x, writing value = 0x%02x\r\n",
 		     base + 0x14, value | 0x87);
 }
 #endif
diff --git a/src/superio/renesas/m3885x/superio.c b/src/superio/renesas/m3885x/superio.c
index 3a9a72c220..693135854d 100644
--- a/src/superio/renesas/m3885x/superio.c
+++ b/src/superio/renesas/m3885x/superio.c
@@ -39,7 +39,7 @@ static void m3885x_init(device_t dev)
 	if (!dev->enabled)
 		return;
 
-	printk_debug("Renesas M3885x: Initializing keyboard.\n");
+	printk(BIOS_DEBUG, "Renesas M3885x: Initializing keyboard.\n");
 	set_kbc_ps2_mode();
 	pc_keyboard_init(&conf->keyboard);
 	m3885_configure_multikey();
diff --git a/src/superio/smsc/lpc47b397/superio.c b/src/superio/smsc/lpc47b397/superio.c
index 237a131246..29826aa860 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_debug("lpc47b397 SensorBus Register Access enabled\r\n");
+		printk(BIOS_DEBUG, "lpc47b397 SensorBus Register Access enabled\r\n");
 		pnp_set_logical_device(dev);
 		enable_hwm_smbus(dev);
 		break;
diff --git a/src/superio/smsc/lpc47n217/superio.c b/src/superio/smsc/lpc47n217/superio.c
index b83fe6cf6d..4e6e6dcee9 100644
--- a/src/superio/smsc/lpc47n217/superio.c
+++ b/src/superio/smsc/lpc47n217/superio.c
@@ -180,7 +180,7 @@ static void lpc47n217_init(device_t dev)
 static void lpc47n217_pnp_set_resource(device_t dev, struct resource *resource)
 {
 	if (!(resource->flags & IORESOURCE_ASSIGNED)) {
-		printk_err("ERROR: %s %02x not allocated\n",
+		printk(BIOS_ERR, "ERROR: %s %02x not allocated\n",
 			dev_path(dev), resource->index);
 		return;
 	}
@@ -200,7 +200,7 @@ static void lpc47n217_pnp_set_resource(device_t dev, struct resource *resource)
 		lpc47n217_pnp_set_irq(dev, resource->base);
 	}
 	else {
-		printk_err("ERROR: %s %02x unknown resource type\n",
+		printk(BIOS_ERR, "ERROR: %s %02x unknown resource type\n",
 			dev_path(dev), resource->index);
 		return;
 	}
diff --git a/src/superio/smsc/lpc47n227/superio.c b/src/superio/smsc/lpc47n227/superio.c
index 50b11c1c90..8dfb774b12 100644
--- a/src/superio/smsc/lpc47n227/superio.c
+++ b/src/superio/smsc/lpc47n227/superio.c
@@ -163,7 +163,7 @@ static void lpc47n227_init(device_t dev)
 		break;
 
 	case LPC47N227_KBDC:
-		printk_debug("LPC47N227: Initializing keyboard.\n");
+		printk(BIOS_DEBUG, "LPC47N227: Initializing keyboard.\n");
 		pc_keyboard_init(&conf->keyboard);
 		break;
 	}
@@ -176,7 +176,7 @@ static void lpc47n227_init(device_t dev)
 static void lpc47n227_pnp_set_resource(device_t dev, struct resource *resource)
 {
 	if (!(resource->flags & IORESOURCE_ASSIGNED)) {
-		printk_err("ERROR: %s %02lx not allocated\n",
+		printk(BIOS_ERR, "ERROR: %s %02lx not allocated\n",
 			   dev_path(dev), resource->index);
 		return;
 	}
@@ -192,7 +192,7 @@ static void lpc47n227_pnp_set_resource(device_t dev, struct resource *resource)
 	} else if (resource->flags & IORESOURCE_IRQ) {
 		lpc47n227_pnp_set_irq(dev, resource->base);
 	} else {
-		printk_err("ERROR: %s %02lx unknown resource type\n",
+		printk(BIOS_ERR, "ERROR: %s %02lx unknown resource type\n",
 			   dev_path(dev), resource->index);
 		return;
 	}
diff --git a/src/superio/smsc/smscsuperio/superio.c b/src/superio/smsc/smscsuperio/superio.c
index b86cd8649e..0fa2c36d76 100644
--- a/src/superio/smsc/smscsuperio/superio.c
+++ b/src/superio/smsc/smscsuperio/superio.c
@@ -304,7 +304,7 @@ static void enable_dev(device_t dev)
 
 		/* TODO: Error handling? */
 
-		printk_info("Found SMSC Super I/O (ID=0x%02x, rev=0x%02x)\n",
+		printk(BIOS_INFO, "Found SMSC Super I/O (ID=0x%02x, rev=0x%02x)\n",
 			    superio_id, superio_rev);
 		first_time = 0;
 
diff --git a/src/superio/via/vt1211/vt1211.c b/src/superio/via/vt1211/vt1211.c
index ae5624055a..46e9689800 100644
--- a/src/superio/via/vt1211/vt1211.c
+++ b/src/superio/via/vt1211/vt1211.c
@@ -113,13 +113,13 @@ static void vt1211_init(struct device *dev)
 		init_hwm(res0->base);
 		break;
 	default:
-		printk_info("vt1211 asked to initialise unknown device!\n");
+		printk(BIOS_INFO, "vt1211 asked to initialise unknown device!\n");
 	}
 }
 
 void vt1211_pnp_enable_resources(device_t dev)
 {
-	printk_debug("%s - enabling\n",dev_path(dev));
+	printk(BIOS_DEBUG, "%s - enabling\n",dev_path(dev));
 	pnp_enter_ext_func_mode(dev);
 	pnp_enable_resources(dev);
 	pnp_exit_ext_func_mode(dev);
@@ -148,7 +148,7 @@ void vt1211_pnp_set_resources(struct device *dev)
 	for(i = 0; i < dev->resources; i++) {
 		resource = &dev->resource[i];
 		if (!(resource->flags & IORESOURCE_ASSIGNED)) {
-			printk_err("ERROR: %s %02x %s size: 0x%010Lx not assigned\n",
+			printk(BIOS_ERR, "ERROR: %s %02x %s size: 0x%010Lx not assigned\n",
 				dev_path(dev), dev->resource->index,
 				resource_type(resource),
 				resource->size);
@@ -166,7 +166,7 @@ void vt1211_pnp_set_resources(struct device *dev)
 			pnp_set_irq(dev, resource->index, resource->base);
 		}
 		else {
-			printk_err("ERROR: %s %02x unknown resource type\n",
+			printk(BIOS_ERR, "ERROR: %s %02x unknown resource type\n",
 				dev_path(dev), resource->index);
 			return;
 		}
@@ -206,7 +206,7 @@ static struct pnp_info pnp_dev_info[] = {
 
 static void enable_dev(struct device *dev)
 {
-	printk_debug("vt1211 enabling PNP devices.\n");
+	printk(BIOS_DEBUG, "vt1211 enabling PNP devices.\n");
 	pnp_enable_devices(dev,
 			&ops,
 			ARRAY_SIZE(pnp_dev_info),
diff --git a/src/superio/winbond/w83627ehg/superio.c b/src/superio/winbond/w83627ehg/superio.c
index 393ea7086a..8deae4a683 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_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\r\n", base, reg,value); */
 		pnp_write_index(base, reg, value);
 	}
 }
@@ -152,7 +152,7 @@ static void w83627ehg_pnp_enable_resources(device_t dev)
 
 	switch (dev->path.pnp.device) {
 	case W83627EHG_HWM:
-		printk_debug("w83627ehg hwm smbus enabled\n");
+		printk(BIOS_DEBUG, "w83627ehg hwm smbus enabled\n");
 		enable_hwm_smbus(dev);
 		break;
 	}
diff --git a/src/superio/winbond/w83627hf/superio.c b/src/superio/winbond/w83627hf/superio.c
index 20f7a207cf..7c470ae8a2 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_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\r\n", base, reg,value);
 #endif
 		pnp_write_index(base, reg, value);
 	}
@@ -172,7 +172,7 @@ static void w83627hf_pnp_enable_resources(device_t dev)
 	pnp_enable_resources(dev);
 	switch(dev->path.pnp.device) {
 	case W83627HF_HWM:
-		printk_debug("w83627hf hwm smbus enabled\n");
+		printk(BIOS_DEBUG, "w83627hf hwm smbus enabled\n");
 		enable_hwm_smbus(dev);
 		break;
 	}