serial m68k: put_char returns

09a6ffa8 · Alan Cox <[email protected]> · 2008-04-30 00:54:01 -07:00

Signed-off-by: Alan Cox <[email protected]>
Acked-by: Greg Ungerer <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>

Commit: 09a6ffa84c8e893d9656296b322dc8145e09e186
Parents: 9e7c9a19

Changes

3 files changed · +7 −5

File	Status	Add	Del	Content
drivers/serial/68328serial.c	modified	+2	−1	View file
drivers/serial/68360serial.c	modified	+3	−2	View file
drivers/serial/mcfserial.c	modified	+2	−2	View file

drivers/serial/68328serial.c

View file

diff --git a/drivers/serial/68328serial.c b/drivers/serial/68328serial.c
index 5ce3e57..bbf5bc5 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)

drivers/serial/68360serial.c

View file

diff --git a/drivers/serial/68360serial.c b/drivers/serial/68360serial.c
index f4f737b..4714bd6 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;
 
 }
 

drivers/serial/mcfserial.c

View file

diff --git a/drivers/serial/mcfserial.c b/drivers/serial/mcfserial.c
index aafa170..43af40d 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;
 }
 
 