diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2007-03-01 06:56:43 -0500 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2007-03-04 14:02:37 -0500 |
commit | 36a885306fdf7bb557c773309c993bfb2d0d693c (patch) | |
tree | 643b246c90653c9451ff7fecff74a79c3de8042c /arch/mips/lasat/lasat_board.c | |
parent | ca471c86043f4a8b01cba02ba2d3431fddcaf606 (diff) |
[MIPS] Fix and cleanup the mess that a dozen prom_printf variants are.
early_printk is a so much saner thing.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/lasat/lasat_board.c')
-rw-r--r-- | arch/mips/lasat/lasat_board.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/arch/mips/lasat/lasat_board.c b/arch/mips/lasat/lasat_board.c index d425120b0282..fbe9a87bd0ad 100644 --- a/arch/mips/lasat/lasat_board.c +++ b/arch/mips/lasat/lasat_board.c | |||
@@ -110,12 +110,13 @@ int lasat_init_board_info(void) | |||
110 | sizeof(struct lasat_eeprom_struct) - 4); | 110 | sizeof(struct lasat_eeprom_struct) - 4); |
111 | 111 | ||
112 | if (crc != lasat_board_info.li_eeprom_info.crc32) { | 112 | if (crc != lasat_board_info.li_eeprom_info.crc32) { |
113 | prom_printf("WARNING...\nWARNING...\nEEPROM CRC does not match calculated, attempting to soldier on...\n"); | 113 | printk(KERN_WARNING "WARNING...\nWARNING...\nEEPROM CRC does " |
114 | "not match calculated, attempting to soldier on...\n"); | ||
114 | } | 115 | } |
115 | 116 | ||
116 | if (lasat_board_info.li_eeprom_info.version != LASAT_EEPROM_VERSION) | 117 | if (lasat_board_info.li_eeprom_info.version != LASAT_EEPROM_VERSION) { |
117 | { | 118 | printk(KERN_WARNING "WARNING...\nWARNING...\nEEPROM version " |
118 | prom_printf("WARNING...\nWARNING...\nEEPROM version %d, wanted version %d, attempting to soldier on...\n", | 119 | "%d, wanted version %d, attempting to soldier on...\n", |
119 | (unsigned int)lasat_board_info.li_eeprom_info.version, | 120 | (unsigned int)lasat_board_info.li_eeprom_info.version, |
120 | LASAT_EEPROM_VERSION); | 121 | LASAT_EEPROM_VERSION); |
121 | } | 122 | } |
@@ -124,7 +125,9 @@ int lasat_init_board_info(void) | |||
124 | cfg1 = lasat_board_info.li_eeprom_info.cfg[1]; | 125 | cfg1 = lasat_board_info.li_eeprom_info.cfg[1]; |
125 | 126 | ||
126 | if ( LASAT_W0_DSCTYPE(cfg0) != 1) { | 127 | if ( LASAT_W0_DSCTYPE(cfg0) != 1) { |
127 | prom_printf("WARNING...\nWARNING...\nInvalid configuration read from EEPROM, attempting to soldier on..."); | 128 | printk(KERN_WARNING "WARNING...\nWARNING...\n" |
129 | "Invalid configuration read from EEPROM, attempting to " | ||
130 | "soldier on..."); | ||
128 | } | 131 | } |
129 | /* We have a valid configuration */ | 132 | /* We have a valid configuration */ |
130 | 133 | ||