diff options
author | Alan Cox <alan@lxorguk.ukuu.org.uk> | 2008-04-30 03:54:01 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-30 11:29:45 -0400 |
commit | 09a6ffa84c8e893d9656296b322dc8145e09e186 (patch) | |
tree | 5de0b78209c35e68894b0202af28f63920d6c4b9 | |
parent | 9e7c9a19c1df8a7450c56c41b9c7405eca7eda07 (diff) |
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>
-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) | |||
200 | local_irq_restore(flags); | 200 | local_irq_restore(flags); |
201 | } | 201 | } |
202 | 202 | ||
203 | static void rs_put_char(char ch) | 203 | static int rs_put_char(char ch) |
204 | { | 204 | { |
205 | int flags, loops = 0; | 205 | int flags, loops = 0; |
206 | 206 | ||
@@ -214,6 +214,7 @@ static void rs_put_char(char ch) | |||
214 | UTX_TXDATA = ch; | 214 | UTX_TXDATA = ch; |
215 | udelay(5); | 215 | udelay(5); |
216 | local_irq_restore(flags); | 216 | local_irq_restore(flags); |
217 | return 1; | ||
217 | } | 218 | } |
218 | 219 | ||
219 | static void rs_start(struct tty_struct *tty) | 220 | 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) | |||
995 | volatile QUICC_BD *bdp; | 995 | volatile QUICC_BD *bdp; |
996 | 996 | ||
997 | if (serial_paranoia_check(info, tty->name, "rs_put_char")) | 997 | if (serial_paranoia_check(info, tty->name, "rs_put_char")) |
998 | return; | 998 | return 0; |
999 | 999 | ||
1000 | if (!tty) | 1000 | if (!tty) |
1001 | return; | 1001 | return 0; |
1002 | 1002 | ||
1003 | bdp = info->tx_cur; | 1003 | bdp = info->tx_cur; |
1004 | while (bdp->status & BD_SC_READY); | 1004 | while (bdp->status & BD_SC_READY); |
@@ -1016,6 +1016,7 @@ static void rs_360_put_char(struct tty_struct *tty, unsigned char ch) | |||
1016 | bdp++; | 1016 | bdp++; |
1017 | 1017 | ||
1018 | info->tx_cur = (QUICC_BD *)bdp; | 1018 | info->tx_cur = (QUICC_BD *)bdp; |
1019 | return 1; | ||
1019 | 1020 | ||
1020 | } | 1021 | } |
1021 | 1022 | ||
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) | |||
1897 | * This is used for console output. | 1897 | * This is used for console output. |
1898 | */ | 1898 | */ |
1899 | 1899 | ||
1900 | void mcfrs_put_char(char ch) | 1900 | int mcfrs_put_char(char ch) |
1901 | { | 1901 | { |
1902 | volatile unsigned char *uartp; | 1902 | volatile unsigned char *uartp; |
1903 | unsigned long flags; | 1903 | unsigned long flags; |
@@ -1921,7 +1921,7 @@ void mcfrs_put_char(char ch) | |||
1921 | mcfrs_init_console(); /* try and get it back */ | 1921 | mcfrs_init_console(); /* try and get it back */ |
1922 | local_irq_restore(flags); | 1922 | local_irq_restore(flags); |
1923 | 1923 | ||
1924 | return; | 1924 | return 1; |
1925 | } | 1925 | } |
1926 | 1926 | ||
1927 | 1927 | ||