staging: gdm724x: gdm_tty: fix tty api build warnings
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 24 Jul 2013 20:15:23 +0000 (13:15 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 24 Jul 2013 20:15:23 +0000 (13:15 -0700)
This fixes the build warnings due to changes in the tty api.  Note, I
don't know if the reference counting is correct, but at least there are
no more build warnings.

Also the tty code needs to be reworked, no static arrays of tty devices
and the like...

Cc: Won Kang <wonkang@gctsemi.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/gdm724x/gdm_tty.c

index 4d4040e3b1012544516ccd9f86da01dfd60d053b..64904e012dc87f33cd927ce95bb678734707a2b4 100644 (file)
@@ -131,7 +131,7 @@ static void gdm_tty_close(struct tty_struct *tty, struct file *filp)
 static int gdm_tty_recv_complete(void *data, int len, int index, int minor, int complete)
 {
        struct tty_str *tty_str = g_tty_str[index][minor];
-       struct tty_struct *tty;
+       struct tty_port *tty_port;
 
        if (!GDM_TTY_READY(tty_str)) {
                if (complete == RECV_PACKET_PROCESS_COMPLETE)
@@ -142,17 +142,15 @@ static int gdm_tty_recv_complete(void *data, int len, int index, int minor, int
        if (!data || !len)
                goto complete_routine;
 
-       tty = tty_port_tty_get(&tty_str->port);
+       tty_port = &tty_str->port;
 
-       if (tty_buffer_request_room(tty, len) == len) {
-               tty_insert_flip_string(tty, data, len);
-               tty_flip_buffer_push(tty);
+       if (tty_buffer_request_room(tty_port, len) == len) {
+               tty_insert_flip_string(tty_port, data, len);
+               tty_flip_buffer_push(tty_port);
        } else {
-               tty_kref_put(tty);
                return TO_HOST_BUFFER_REQUEST_FAIL;
        }
 
-       tty_kref_put(tty);
 complete_routine:
        if (complete == RECV_PACKET_PROCESS_COMPLETE)
                gdm_tty_recv(tty_str, gdm_tty_recv_complete);