tty: metag_da: fix flipping after tty changes
cover tty: metag_da: fix flipping after tty changes
The first patch fixes up tty/metag_da after Jiri's changes, "TTY: switch tty_flip_buffer_push" and "TTY: convert more flipping functions", switched tty_flip_buffer_push() and tty_prepare_flip_string() to take tty_port rather than a tty_struct.
The second just refactors slightly as a result of it.
How is this sort of thing usually handled? I suppose either I squash it into the original driver and base it on tty-next, move it into tty-next, or just fix it up afterwards?
James Hogan (2):
tty: metag_da: update flip functions to use tty_port
tty: metag_da: avoid getting tty kref in dashtty_timer()
drivers/tty/metag_da.c | 36 +++++++++++++++++------------------- 1 files changed, 17 insertions(+), 19 deletions(-)
Signature · 1 line
1.7.7.6
PATCH 1/2 tty: metag_da: update flip functions to use tty_port
Commit "TTY: switch tty_flip_buffer_push" and "TTY: convert more flipping functions" switched tty_flip_buffer_push() and tty_prepare_flip_string() to take tty_port rather than a tty_struct.
Convert the metag_da tty driver similarly.
--- drivers/tty/metag_da.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-)
drivers/tty/metag_da.c +3 -2
@@ -163,13 +163,14 @@ static int fetch_data(struct tty_struct *tty)int space;unsigned char *cbuf; - space =tty_prepare_flip_string (tty, &cbuf, received); + space =tty_prepare_flip_string (&dport->port, &cbuf, + received);if (space <=0 ) goto unlock;memcpy (cbuf, dport->rx_buf, space); -tty_flip_buffer_push (tty); +tty_flip_buffer_push (&dport->port); } } unlock:
Signature · 1 line
1.7.7.6
PATCH 2/2 tty: metag_da: avoid getting tty kref in dashtty_timer()
In reply to James HoganGetting the tty kref in dashtty_timer() is no longer necessary since it isn't needed in fetch_data() any longer (due to changes which make the tty flip functions refer to tty_ports instead of tty_structs), so just pass around a channel number instead.
--- drivers/tty/metag_da.c | 31 ++++++++++++++----------------- 1 files changed, 14 insertions(+), 17 deletions(-)
drivers/tty/metag_da.c +14 -17
@@ -147,9 +147,8 @@ static int chancall(int in_bios_function, int in_channel,/* * Attempts to fetch count bytes from channel and returns actual count. */ -static int fetch_data (struct tty_struct *tty) +static int fetch_data (unsigned int channel) { -unsigned int channel = tty->index;struct dashtty_port *dport = &dashtty_ports[channel];int received =0 ;
@@ -180,31 +179,31 @@ unlock: }/** -* find_channel_to_poll() - Returns kref to the next channel tty to poll. -* Returns: The TTY of the next channel to poll, or NULL if no TTY needs -* polling. Release with tty_kref_put(). +* find_channel_to_poll() - Returns number of the next channel to poll. +* Returns: The number of the next channel to poll, or -1 if none need +* polling. */ -static struct tty_struct *find_channel_to_poll (void ) +static int find_channel_to_poll (void ) {static int last_polled_channel;int last = last_polled_channel;int chan; -struct tty_struct *tty =NULL ; +struct dashtty_port *dport;for (chan = last +1 ; ; ++chan) {if (chan >=NUM_TTY_CHANNELS ) chan =0 ; - tty =tty_port_tty_get (&dashtty_ports[chan].port); -if (tty) { + dport = &dashtty_ports[chan]; +if (dport->rx_buf) { last_polled_channel = chan; -return tty; +return chan; }if (chan == last)break ; } -return tty; +return -1 ; }/**
@@ -302,19 +301,17 @@ static int put_data(void *arg)*/ static void dashtty_timer (unsigned long ignored) { -struct tty_struct *tty; +int channel;/* If there are no ports open do nothing and don't poll again. */ if (!atomic_read (&num_channels_need_poll))return ; - tty =find_channel_to_poll (); + channel =find_channel_to_poll ();/* Did we find a channel to poll? */ -if (tty) { -fetch_data (tty); -tty_kref_put (tty); - } +if (channel >=0 ) +fetch_data (channel);mod_timer_pinned (&poll_timer, jiffies +DA_TTY_POLL ); }
Signature · 1 line
1.7.7.6
Quoted 7 lines · James Hogan
The first patch fixes up tty/metag_da after Jiri's changes, "TTY: switch
tty_flip_buffer_push" and "TTY: convert more flipping functions", switchedtty_flip_buffer_push()andtty_prepare_flip_string()to taketty_portrather than atty_struct.The second just refactors slightly as a result of it.
Quoted 7 lines
How is this sort of thing usually handled? I suppose either I squash it into the original driver and base it on tty-next, move it into tty-next, or just fix it up afterwards?
James Hogan (2):
tty:metag_da: update flip functions to usetty_port
tty:metag_da: avoid getting tty kref indashtty_timer()
They both look good. You can add my:
if you want.
thanks,
Signature · 2 lines
js suse labs
Quoted 12 lines · Jiri Slaby
Quoted 11 lines · James Hogan
The first patch fixes up tty/metag_da after Jiri's changes, "TTY: switch
tty_flip_buffer_push" and "TTY: convert more flipping functions", switchedtty_flip_buffer_push()andtty_prepare_flip_string()to taketty_portrather than atty_struct.The second just refactors slightly as a result of it.
How is this sort of thing usually handled? I suppose either I squash it into the original driver and base it on tty-next, move it into tty-next, or just fix it up afterwards?
Quoted 7 lines
Quoted 3 lines
James Hogan (2):
tty:metag_da: update flip functions to usetty_port
tty:metag_da: avoid getting tty kref indashtty_timer()They both look good. You can add my:
Acked-by Jiri Slaby <[email protected]>if you want.
Thanks Jiri
Cheers
James