Commit 09a6ffa8 authored by Alan Cox's avatar Alan Cox Committed by Linus Torvalds

serial m68k: put_char returns

Signed-off-by: default avatarAlan Cox <alan@redhat.com>
Acked-by: default avatarGreg Ungerer <gerg@uclinux.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 9e7c9a19
...@@ -200,7 +200,7 @@ static void rs_stop(struct tty_struct *tty) ...@@ -200,7 +200,7 @@ static void rs_stop(struct tty_struct *tty)
local_irq_restore(flags); local_irq_restore(flags);
} }
static void rs_put_char(char ch) static int rs_put_char(char ch)
{ {
int flags, loops = 0; int flags, loops = 0;
...@@ -214,6 +214,7 @@ static void rs_put_char(char ch) ...@@ -214,6 +214,7 @@ static void rs_put_char(char ch)
UTX_TXDATA = ch; UTX_TXDATA = ch;
udelay(5); udelay(5);
local_irq_restore(flags); local_irq_restore(flags);
return 1;
} }
static void rs_start(struct tty_struct *tty) static void rs_start(struct tty_struct *tty)
......
...@@ -995,10 +995,10 @@ static void rs_360_put_char(struct tty_struct *tty, unsigned char ch) ...@@ -995,10 +995,10 @@ static void rs_360_put_char(struct tty_struct *tty, unsigned char ch)
volatile QUICC_BD *bdp; volatile QUICC_BD *bdp;
if (serial_paranoia_check(info, tty->name, "rs_put_char")) if (serial_paranoia_check(info, tty->name, "rs_put_char"))
return; return 0;
if (!tty) if (!tty)
return; return 0;
bdp = info->tx_cur; bdp = info->tx_cur;
while (bdp->status & BD_SC_READY); while (bdp->status & BD_SC_READY);
...@@ -1016,6 +1016,7 @@ static void rs_360_put_char(struct tty_struct *tty, unsigned char ch) ...@@ -1016,6 +1016,7 @@ static void rs_360_put_char(struct tty_struct *tty, unsigned char ch)
bdp++; bdp++;
info->tx_cur = (QUICC_BD *)bdp; info->tx_cur = (QUICC_BD *)bdp;
return 1;
} }
......
...@@ -1897,7 +1897,7 @@ static struct tty_driver *mcfrs_console_device(struct console *c, int *index) ...@@ -1897,7 +1897,7 @@ static struct tty_driver *mcfrs_console_device(struct console *c, int *index)
* This is used for console output. * This is used for console output.
*/ */
void mcfrs_put_char(char ch) int mcfrs_put_char(char ch)
{ {
volatile unsigned char *uartp; volatile unsigned char *uartp;
unsigned long flags; unsigned long flags;
...@@ -1921,7 +1921,7 @@ void mcfrs_put_char(char ch) ...@@ -1921,7 +1921,7 @@ void mcfrs_put_char(char ch)
mcfrs_init_console(); /* try and get it back */ mcfrs_init_console(); /* try and get it back */
local_irq_restore(flags); local_irq_restore(flags);
return; return 1;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment