Skip to content

Commit

Permalink
serial m68k: put_char returns
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Alan Cox authored and Linus Torvalds committed Apr 30, 2008
1 parent 9e7c9a1 commit 09a6ffa
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 5 deletions.
3 changes: 2 additions & 1 deletion drivers/serial/68328serial.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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)
Expand Down
5 changes: 3 additions & 2 deletions drivers/serial/68360serial.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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;

}

Expand Down
4 changes: 2 additions & 2 deletions drivers/serial/mcfserial.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
}


Expand Down

0 comments on commit 09a6ffa

Please sign in to comment.