[PATCH] M68k update (part 48)

console.wait_key was removed

diff --git a/arch/m68k/mac/debug.c b/arch/m68k/mac/debug.c
index a3c630d14d6ba2a51cc4902ba950cd724bf186a0..eafd9892c9b49e9369dccf96b99b713147fe753c 100644 (file)
--- a/arch/m68k/mac/debug.c
+++ b/arch/m68k/mac/debug.c
@@ -235,20 +235,6 @@ void mac_scca_console_write (struct console *co, const char *str,
     }
 }
 
-#if defined(CONFIG_SERIAL_CONSOLE) || defined(DEBUG_SERIAL)
-int mac_sccb_console_wait_key(struct console *co)
-{
-    int i;
-    do {
-       for( i = uSEC; i > 0; --i )
-               barrier();
-    } while( !(scc.cha_b_ctrl & 0x01) ); /* wait for rx buf filled */
-    for( i = uSEC; i > 0; --i )
-       barrier();
-    return( scc.cha_b_data );
-}
-
-#endif
 
 /* The following two functions do a quick'n'dirty initialization of the MFP or
  * SCC serial ports. They're used by the debugging interface, kgdb, and the
@@ -390,9 +376,6 @@ void __init mac_debug_init(void)
        /* Mac printer port */
        mac_init_scc_port( B9600|CS8, 1 );
        mac_console_driver.write = mac_sccb_console_write;
-#ifdef CONFIG_SERIAL_CONSOLE
-       mac_console_driver.wait_key = mac_sccb_console_wait_key;
-#endif
        scc_port = 1;
     }
 #endif

diff --git a/drivers/char/amiserial.c b/drivers/char/amiserial.c
index fba94ef1fded51853a5d84032e39fdeb43e1e2d2..97dbae904bcc5d3be4f0ed5024264fd656d5be29 100644 (file)
--- a/drivers/char/amiserial.c
+++ b/drivers/char/amiserial.c
@@ -2306,43 +2306,17 @@ static void serial_console_write(struct console *co, const char *s,
        custom.intena = IF_SETCLR | (intena & IF_TBE);
 }
 
-/*
- *     Receive character from the serial port
- */
-static int serial_console_wait_key(struct console *co)
-{
-       unsigned short intena = custom.intenar;
-       int ch;
-
-       custom.intena = IF_RBF;
-
-       while (!(custom.intreqr & IF_RBF))
-               barrier();
-       ch = custom.serdatr & 0xff;
-       custom.intreq = IF_RBF;
-
-       custom.intena = IF_SETCLR | (intena & IF_RBF);
-
-       return ch;
-}
-
 static kdev_t serial_console_device(struct console *c)
 {
        return mk_kdev(TTY_MAJOR, 64);
 }
 
 static struct console sercons = {
-       "ttyS",
-       serial_console_write,
-       NULL,
-       serial_console_device,
-       serial_console_wait_key,
-       NULL,
-       NULL,
-       CON_PRINTBUFFER,
-       -1,
-       0,
-       NULL
+       .name =         "ttyS",
+       .write =        serial_console_write,
+       .device =       serial_console_device,
+       .flags =        CON_PRINTBUFFER,
+       .index =        -1,
 };
 
 /*