summaryrefslogtreecommitdiffstats
path: root/drivers/tty/serial
diff options
context:
space:
mode:
authorJiri Slaby2013-01-03 15:53:02 +0100
committerGreg Kroah-Hartman2013-01-16 07:17:29 +0100
commit2f69335710884ae6112fc8196ebe29b5cda7b79b (patch)
treec97bec97e703faace437235d3bcbbf80c078ad21 /drivers/tty/serial
parentTTY: switch tty_buffer_request_room to tty_port (diff)
downloadkernel-qcow2-linux-2f69335710884ae6112fc8196ebe29b5cda7b79b.tar.gz
kernel-qcow2-linux-2f69335710884ae6112fc8196ebe29b5cda7b79b.tar.xz
kernel-qcow2-linux-2f69335710884ae6112fc8196ebe29b5cda7b79b.zip
TTY: convert more flipping functions
Now, we start converting tty buffer functions to actually use tty_port. This will allow us to get rid of the need of tty pointer in many call sites. Only tty_port will be needed and hence no more tty_port_tty_get calls in those paths. Now 4 string flipping ones are on turn: * tty_insert_flip_string_flags * tty_insert_flip_string_fixed_flag * tty_prepare_flip_string * tty_prepare_flip_string_flags Signed-off-by: Jiri Slaby <jslaby@suse.cz> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty/serial')
-rw-r--r--drivers/tty/serial/msm_smd_tty.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/tty/serial/msm_smd_tty.c b/drivers/tty/serial/msm_smd_tty.c
index 925d1fa153db..b43b4ec39269 100644
--- a/drivers/tty/serial/msm_smd_tty.c
+++ b/drivers/tty/serial/msm_smd_tty.c
@@ -70,7 +70,7 @@ static void smd_tty_notify(void *priv, unsigned event)
if (avail == 0)
break;
- avail = tty_prepare_flip_string(tty, &ptr, avail);
+ avail = tty_prepare_flip_string(&info->port, &ptr, avail);
if (smd_read(info->ch, ptr, avail) != avail) {
/* shouldn't be possible since we're in interrupt