patch-2.2.15 linux/drivers/s390/char/hwc_con.c

• Lines: 71
• Date: Fri Apr 21 12:46:24 2000
• Orig file: v2.2.14/drivers/s390/char/hwc_con.c
• Orig date: Tue Jan 4 21:18:53 2000

diff -u --new-file --recursive --exclude-from ../../exclude v2.2.14/drivers/s390/char/hwc_con.c linux/drivers/s390/char/hwc_con.c
@@ -20,7 +20,6 @@
 
 extern void hwc_tty_init(void);
 
-
 #ifdef CONFIG_HWC_CONSOLE
 
 #define  hwc_console_major 4 
@@ -32,7 +31,9 @@
 
 #define  HWC_CON_PRINT_HEADER "hwc console driver: "
 
-struct console hwc_console = {
+struct console hwc_console =
+{
+
 	hwc_console_name,
 	hwc_console_write,
 	NULL,
@@ -46,13 +47,15 @@
 	NULL
 };
  
-void hwc_console_write(
+void 
+hwc_console_write (
 	struct console *console,
 	const char *message,
 	unsigned int count)
 {
-	if (console->device(console) != hwc_console.device(&hwc_console)) 
-	{
+
+	if (console->device (console) != hwc_console.device (&hwc_console)) {
+
 		hwc_printk(KERN_WARNING HWC_CON_PRINT_HEADER
 				"hwc_console_write() called with wrong "
 				"device number");
@@ -61,8 +64,8 @@
 	hwc_write(0, message, count);
 }
 
-
-kdev_t hwc_console_device(struct console *c)
+kdev_t 
+hwc_console_device (struct console * c)
 {
 	return  MKDEV(hwc_console_major, hwc_console_minor);
 }
@@ -76,12 +79,19 @@
         if (MACHINE_IS_VM)
                 return kmem_start;
 #endif
+	if (MACHINE_IS_P390)
+		return kmem_start;
+
 	if (hwc_init(&kmem_start) == 0) {
+
 #ifdef CONFIG_HWC_CONSOLE
+
 		register_console(&hwc_console);
 #endif	
+
 		hwc_tty_init();
-	}
-	else panic(HWC_CON_PRINT_HEADER "hwc initialisation failed !");
+	} else
+		panic (HWC_CON_PRINT_HEADER "hwc initialisation failed !");
+
 	return kmem_start;
 }