mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2024-11-25 07:20:53 +07:00
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>
This commit is contained in:
parent
9e7c9a19c1
commit
09a6ffa84c
@ -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)
|
||||
|
@ -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;
|
||||
|
||||
}
|
||||
|
||||
|
@ -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;
|
||||
}
|
||||
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user