Skip to content

Commit

Permalink
TTY: 68328serial, propagate tty
Browse files Browse the repository at this point in the history 
We need tty at some places, but info->tty might be NULL at those. Let
us propagate tty from callers where we know we have a valid tty. This
will make a switch to tty refcounting simpler.

Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: linux-m68k@lists.linux-m68k.org
Acked-by: Greg Ungerer <gerg@uclinux.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Jiri Slaby authored and Greg Kroah-Hartman committed Apr 9, 2012
1 parent a85dd82 commit 467712c
Showing 1 changed file with 27 additions and 26 deletions.
53 changes: 27 additions & 26 deletions drivers/tty/serial/68328serial.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ m68328_uart *uart_addr = (m68328_uart *)USTCNT_ADDR;

struct tty_driver *serial_driver;

static void change_speed(struct m68k_serial *info);
static void change_speed(struct m68k_serial *info, struct tty_struct *tty);

/*
* Setup for console. Argument comes from the boot command line.
Expand Down Expand Up @@ -263,9 +263,9 @@ static void rs_start(struct tty_struct *tty)
local_irq_restore(flags);
}

static void receive_chars(struct m68k_serial *info, unsigned short rx)
static void receive_chars(struct m68k_serial *info, struct tty_struct *tty,
unsigned short rx)
{
struct tty_struct *tty = info->tty;
m68328_uart *uart = &uart_addr[info->line];
unsigned char ch, flag;

Expand Down Expand Up @@ -317,7 +317,7 @@ static void receive_chars(struct m68k_serial *info, unsigned short rx)
return;
}

static void transmit_chars(struct m68k_serial *info)
static void transmit_chars(struct m68k_serial *info, struct tty_struct *tty)
{
m68328_uart *uart = &uart_addr[info->line];

Expand All @@ -328,7 +328,7 @@ static void transmit_chars(struct m68k_serial *info)
goto clear_and_return;
}

if((info->xmit_cnt <= 0) || info->tty->stopped) {
if ((info->xmit_cnt <= 0) || !tty || tty->stopped) {
/* That's peculiar... TX ints off */
uart->ustcnt &= ~USTCNT_TX_INTR_MASK;
goto clear_and_return;
Expand Down Expand Up @@ -356,6 +356,7 @@ static void transmit_chars(struct m68k_serial *info)
irqreturn_t rs_interrupt(int irq, void *dev_id)
{
struct m68k_serial *info = dev_id;
struct tty_struct *tty = info->tty;
m68328_uart *uart;
unsigned short rx;
unsigned short tx;
Expand All @@ -366,15 +367,17 @@ irqreturn_t rs_interrupt(int irq, void *dev_id)
#ifdef USE_INTS
tx = uart->utx.w;

if (rx & URX_DATA_READY) receive_chars(info, rx);
if (tx & UTX_TX_AVAIL) transmit_chars(info);
if (rx & URX_DATA_READY)
receive_chars(info, tty, rx);
if (tx & UTX_TX_AVAIL)
transmit_chars(info, tty);
#else
receive_chars(info, rx);
receive_chars(info, tty, rx);
#endif
return IRQ_HANDLED;
}

static int startup(struct m68k_serial * info)
static int startup(struct m68k_serial *info, struct tty_struct *tty)
{
m68328_uart *uart = &uart_addr[info->line];
unsigned long flags;
Expand Down Expand Up @@ -409,15 +412,15 @@ static int startup(struct m68k_serial * info)
uart->ustcnt = USTCNT_UEN | USTCNT_RXEN | USTCNT_RX_INTR_MASK;
#endif

if (info->tty)
clear_bit(TTY_IO_ERROR, &info->tty->flags);
if (tty)
clear_bit(TTY_IO_ERROR, &tty->flags);
info->xmit_cnt = info->xmit_head = info->xmit_tail = 0;

/*
* and set the speed of the serial port
*/

change_speed(info);
change_speed(info, tty);

info->tport.flags |= ASYNC_INITIALIZED;
local_irq_restore(flags);
Expand All @@ -428,7 +431,7 @@ static int startup(struct m68k_serial * info)
* This routine will shutdown a serial port; interrupts are disabled, and
* DTR is dropped if the hangup on close termio flag is on.
*/
static void shutdown(struct m68k_serial * info)
static void shutdown(struct m68k_serial *info, struct tty_struct *tty)
{
m68328_uart *uart = &uart_addr[info->line];
unsigned long flags;
Expand All @@ -444,8 +447,8 @@ static void shutdown(struct m68k_serial * info)
info->xmit_buf = 0;
}

if (info->tty)
set_bit(TTY_IO_ERROR, &info->tty->flags);
if (tty)
set_bit(TTY_IO_ERROR, &tty->flags);

info->tport.flags &= ~ASYNC_INITIALIZED;
local_irq_restore(flags);
Expand Down Expand Up @@ -503,17 +506,15 @@ struct {
* This routine is called to set the UART divisor registers to match
* the specified baud rate for a serial port.
*/
static void change_speed(struct m68k_serial *info)
static void change_speed(struct m68k_serial *info, struct tty_struct *tty)
{
m68328_uart *uart = &uart_addr[info->line];
unsigned short port;
unsigned short ustcnt;
unsigned cflag;
int i;

if (!info->tty || !info->tty->termios)
return;
cflag = info->tty->termios->c_cflag;
cflag = tty->termios->c_cflag;
if (!(port = info->port))
return;

Expand Down Expand Up @@ -832,7 +833,7 @@ static int get_serial_info(struct m68k_serial * info,
return 0;
}

static int set_serial_info(struct m68k_serial * info,
static int set_serial_info(struct m68k_serial *info, struct tty_struct *tty,
struct serial_struct * new_info)
{
struct tty_port *port = &info->tport;
Expand Down Expand Up @@ -875,7 +876,7 @@ static int set_serial_info(struct m68k_serial * info,
port->closing_wait = new_serial.closing_wait;

check_and_exit:
retval = startup(info);
retval = startup(info, tty);
return retval;
}

Expand Down Expand Up @@ -961,7 +962,7 @@ static int rs_ioctl(struct tty_struct *tty,
return get_serial_info(info,
(struct serial_struct *) arg);
case TIOCSSERIAL:
return set_serial_info(info,
return set_serial_info(info, tty,
(struct serial_struct *) arg);
case TIOCSERGETLSR: /* Get line status register */
return get_lsr_info(info, (unsigned int *) arg);
Expand All @@ -980,7 +981,7 @@ static void rs_set_termios(struct tty_struct *tty, struct ktermios *old_termios)
{
struct m68k_serial *info = (struct m68k_serial *)tty->driver_data;

change_speed(info);
change_speed(info, tty);

if ((old_termios->c_cflag & CRTSCTS) &&
!(tty->termios->c_cflag & CRTSCTS)) {
Expand Down Expand Up @@ -1056,7 +1057,7 @@ static void rs_close(struct tty_struct *tty, struct file * filp)
uart->ustcnt &= ~USTCNT_RXEN;
uart->ustcnt &= ~(USTCNT_RXEN | USTCNT_RX_INTR_MASK);

shutdown(info);
shutdown(info, tty);
rs_flush_buffer(tty);

tty_ldisc_flush(tty);
Expand Down Expand Up @@ -1094,7 +1095,7 @@ void rs_hangup(struct tty_struct *tty)
return;

rs_flush_buffer(tty);
shutdown(info);
shutdown(info, tty);
info->tport.count = 0;
info->tport.flags &= ~ASYNC_NORMAL_ACTIVE;
info->tty = NULL;
Expand Down Expand Up @@ -1214,7 +1215,7 @@ int rs_open(struct tty_struct *tty, struct file * filp)
/*
* Start up serial port
*/
retval = startup(info);
retval = startup(info, tty);
if (retval)
return retval;

Expand Down

0 comments on commit 467712c

Please sign in to comment.