TTY: switch tty_flip_buffer_push
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. Now, the one where most of tty_port_tty_get gets removed: tty_flip_buffer_push. IOW we also closed all the races in drivers not using tty_port_tty_get at all yet. Also we move tty_flip_buffer_push declaration from include/linux/tty.h to include/linux/tty_flip.h to all others while we are changing it anyway. Signed-off-by: Jiri Slaby <jslaby@suse.cz> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:

committed by
Greg Kroah-Hartman

parent
d6c53c0e9b
commit
2e124b4a39
@@ -413,7 +413,7 @@ static void raw3215_irq(struct ccw_device *cdev, unsigned long intparm,
|
||||
case CTRLCHAR_CTRL:
|
||||
tty_insert_flip_char(&raw->port, cchar,
|
||||
TTY_NORMAL);
|
||||
tty_flip_buffer_push(tty);
|
||||
tty_flip_buffer_push(&raw->port);
|
||||
break;
|
||||
|
||||
case CTRLCHAR_NONE:
|
||||
@@ -427,7 +427,7 @@ static void raw3215_irq(struct ccw_device *cdev, unsigned long intparm,
|
||||
count -= 2;
|
||||
tty_insert_flip_string(&raw->port, raw->inbuf,
|
||||
count);
|
||||
tty_flip_buffer_push(tty);
|
||||
tty_flip_buffer_push(&raw->port);
|
||||
break;
|
||||
}
|
||||
} else if (req->type == RAW3215_WRITE) {
|
||||
|
@@ -343,7 +343,7 @@ sclp_tty_input(unsigned char* buf, unsigned int count)
|
||||
break;
|
||||
case CTRLCHAR_CTRL:
|
||||
tty_insert_flip_char(&sclp_port, cchar, TTY_NORMAL);
|
||||
tty_flip_buffer_push(tty);
|
||||
tty_flip_buffer_push(&sclp_port);
|
||||
break;
|
||||
case CTRLCHAR_NONE:
|
||||
/* send (normal) input to line discipline */
|
||||
@@ -355,7 +355,7 @@ sclp_tty_input(unsigned char* buf, unsigned int count)
|
||||
tty_insert_flip_char(&sclp_port, '\n', TTY_NORMAL);
|
||||
} else
|
||||
tty_insert_flip_string(&sclp_port, buf, count - 2);
|
||||
tty_flip_buffer_push(tty);
|
||||
tty_flip_buffer_push(&sclp_port);
|
||||
break;
|
||||
}
|
||||
tty_kref_put(tty);
|
||||
|
@@ -461,14 +461,9 @@ sclp_vt220_write(struct tty_struct *tty, const unsigned char *buf, int count)
|
||||
static void
|
||||
sclp_vt220_receiver_fn(struct evbuf_header *evbuf)
|
||||
{
|
||||
struct tty_struct *tty = tty_port_tty_get(&sclp_vt220_port);
|
||||
char *buffer;
|
||||
unsigned int count;
|
||||
|
||||
/* Ignore input if device is not open */
|
||||
if (tty == NULL)
|
||||
return;
|
||||
|
||||
buffer = (char *) ((addr_t) evbuf + sizeof(struct evbuf_header));
|
||||
count = evbuf->length - sizeof(struct evbuf_header);
|
||||
|
||||
@@ -481,10 +476,9 @@ sclp_vt220_receiver_fn(struct evbuf_header *evbuf)
|
||||
buffer++;
|
||||
count--;
|
||||
tty_insert_flip_string(&sclp_vt220_port, buffer, count);
|
||||
tty_flip_buffer_push(tty);
|
||||
tty_flip_buffer_push(&sclp_vt220_port);
|
||||
break;
|
||||
}
|
||||
tty_kref_put(tty);
|
||||
}
|
||||
|
||||
/*
|
||||
|
Reference in New Issue
Block a user