[<prev] [next>] [day] [month] [year] [list]
Message-ID: <20080413180703.4c937f9f@core>
Date: Sun, 13 Apr 2008 18:07:03 +0100
From: Alan Cox <alan@...rguk.ukuu.org.uk>
To: akpm@...l.org, linux-kernel@...r.kernel.org
Subject: [PATCH] serial m68k: put_char returns
Signed-off-by: Alan Cox <alan@...hat.com>
diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.vanilla-2.6.25-rc8-mm2/drivers/serial/68328serial.c linux-2.6.25-rc8-mm2/drivers/serial/68328serial.c
--- linux.vanilla-2.6.25-rc8-mm2/drivers/serial/68328serial.c 2008-04-13 15:36:54.000000000 +0100
+++ linux-2.6.25-rc8-mm2/drivers/serial/68328serial.c 2008-04-13 15:41:06.000000000 +0100
@@ -200,7 +200,7 @@
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 @@
UTX_TXDATA = ch;
udelay(5);
local_irq_restore(flags);
+ return 1;
}
static void rs_start(struct tty_struct *tty)
diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.vanilla-2.6.25-rc8-mm2/drivers/serial/68360serial.c linux-2.6.25-rc8-mm2/drivers/serial/68360serial.c
--- linux.vanilla-2.6.25-rc8-mm2/drivers/serial/68360serial.c 2008-04-13 15:36:54.000000000 +0100
+++ linux-2.6.25-rc8-mm2/drivers/serial/68360serial.c 2008-04-13 15:41:07.000000000 +0100
@@ -994,10 +994,10 @@
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);
@@ -1015,6 +1015,7 @@
bdp++;
info->tx_cur = (QUICC_BD *)bdp;
+ return 1;
}
diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.vanilla-2.6.25-rc8-mm2/drivers/serial/mcfserial.c linux-2.6.25-rc8-mm2/drivers/serial/mcfserial.c
--- linux.vanilla-2.6.25-rc8-mm2/drivers/serial/mcfserial.c 2008-04-13 15:36:54.000000000 +0100
+++ linux-2.6.25-rc8-mm2/drivers/serial/mcfserial.c 2008-04-13 15:41:06.000000000 +0100
@@ -1898,7 +1898,7 @@
* 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;
@@ -1922,7 +1922,7 @@
mcfrs_init_console(); /* try and get it back */
local_irq_restore(flags);
- return;
+ return 1;
}
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists