TTY: switch tty_insert_flip_string

Now, we start converting tty buffer functions to actually use
tty_port. This will allow us to get rid of the need of tty in many
call sites. Only tty_port will needed and hence no more
tty_port_tty_get in those paths.

tty_insert_flip_string this time.

Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

2 files changed, 4 insertions, 3 deletions

diff --git a/net/bluetooth/rfcomm/tty.c b/net/bluetooth/rfcomm/tty.c
index bd6fd0f43d2b..cbec3b642871 100644
--- a/net/bluetooth/rfcomm/tty.c
+++ b/net/bluetooth/rfcomm/tty.c
@@ -556,7 +556,7 @@ static void rfcomm_dev_data_ready(struct rfcomm_dlc *dlc, struct sk_buff *skb)
 
         BT_DBG("dlc %p tty %p len %d", dlc, tty, skb->len);
 
-        tty_insert_flip_string(tty, skb->data, skb->len);
+        tty_insert_flip_string(&dev->port, skb->data, skb->len);
         tty_flip_buffer_push(tty);
 
         kfree_skb(skb);
@@ -633,7 +633,8 @@ static void rfcomm_tty_copy_pending(struct rfcomm_dev *dev)
         rfcomm_dlc_lock(dev->dlc);
 
         while ((skb = skb_dequeue(&dev->pending))) {
-                inserted += tty_insert_flip_string(tty, skb->data, skb->len);
+                inserted += tty_insert_flip_string(&dev->port, skb->data,
+                                skb->len);
                 kfree_skb(skb);
         }
 
diff --git a/net/irda/ircomm/ircomm_tty.c b/net/irda/ircomm/ircomm_tty.c
index a68c88cdec6e..14b08e376f9f 100644
--- a/net/irda/ircomm/ircomm_tty.c
+++ b/net/irda/ircomm/ircomm_tty.c
@@ -1141,7 +1141,7 @@ static int ircomm_tty_data_indication(void *instance, void *sap,
          * Use flip buffer functions since the code may be called from interrupt
          * context
          */
-        tty_insert_flip_string(tty, skb->data, skb->len);
+        tty_insert_flip_string(&self->port, skb->data, skb->len);
         tty_flip_buffer_push(tty);
         tty_kref_put(tty);