diff options
| author | Alan Cox <alan@lxorguk.ukuu.org.uk> | 2008-04-30 00:54:01 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-30 08:29:45 -0700 |
| commit | 09a6ffa84c8e893d9656296b322dc8145e09e186 (patch) | |
| tree | 5de0b78209c35e68894b0202af28f63920d6c4b9 /drivers | |
| parent | 9e7c9a19c1df8a7450c56c41b9c7405eca7eda07 (diff) | |
| download | linux-stable-09a6ffa84c8e893d9656296b322dc8145e09e186.tar.gz linux-stable-09a6ffa84c8e893d9656296b322dc8145e09e186.tar.bz2 linux-stable-09a6ffa84c8e893d9656296b322dc8145e09e186.zip | |
serial m68k: put_char returns
Signed-off-by: Alan Cox <alan@redhat.com>
Acked-by: Greg Ungerer <gerg@uclinux.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/serial/68328serial.c | 3 | ||||
| -rw-r--r-- | drivers/serial/68360serial.c | 5 | ||||
| -rw-r--r-- | drivers/serial/mcfserial.c | 4 |
3 files changed, 7 insertions, 5 deletions
diff --git a/drivers/serial/68328serial.c b/drivers/serial/68328serial.c index 5ce3e57bff0b..bbf5bc5892c7 100644 --- a/drivers/serial/68328serial.c +++ b/drivers/serial/68328serial.c @@ -200,7 +200,7 @@ static void rs_stop(struct tty_struct *tty) local_irq_restore(flags); } -static void rs_put_char(char ch) +static int rs_put_char(char ch) { int flags, loops = 0; @@ -214,6 +214,7 @@ static void rs_put_char(char ch) UTX_TXDATA = ch; udelay(5); local_irq_restore(flags); + return 1; } static void rs_start(struct tty_struct *tty) diff --git a/drivers/serial/68360serial.c b/drivers/serial/68360serial.c index f4f737bfa0a7..4714bd697af2 100644 --- a/drivers/serial/68360serial.c +++ b/drivers/serial/68360serial.c @@ -995,10 +995,10 @@ static void rs_360_put_char(struct tty_struct *tty, unsigned char ch) volatile QUICC_BD *bdp; if (serial_paranoia_check(info, tty->name, "rs_put_char")) - return; + return 0; if (!tty) - return; + return 0; bdp = info->tx_cur; while (bdp->status & BD_SC_READY); @@ -1016,6 +1016,7 @@ static void rs_360_put_char(struct tty_struct *tty, unsigned char ch) bdp++; info->tx_cur = (QUICC_BD *)bdp; + return 1; } diff --git a/drivers/serial/mcfserial.c b/drivers/serial/mcfserial.c index aafa1704e1ab..43af40d59b8a 100644 --- a/drivers/serial/mcfserial.c +++ b/drivers/serial/mcfserial.c @@ -1897,7 +1897,7 @@ static struct tty_driver *mcfrs_console_device(struct console *c, int *index) * This is used for console output. */ -void mcfrs_put_char(char ch) +int mcfrs_put_char(char ch) { volatile unsigned char *uartp; unsigned long flags; @@ -1921,7 +1921,7 @@ void mcfrs_put_char(char ch) mcfrs_init_console(); /* try and get it back */ local_irq_restore(flags); - return; + return 1; } |