hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

TTY: ipwireless, add tty_port 

And use count from that.

Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Cc: Jiri Kosina <jkosina@suse.cz>
Acked-by: David Sterba <dsterba@suse.cz>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Jiri Slaby 2012-04-02 13:54:33 +02:00 committed by Greg Kroah-Hartman
parent e6df3cce07
commit 7393af808f
1 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
drivers/tty/ipwireless/tty.c
View File

@ -44,6 +44,7 @@
#define TTYTYPE_RAS_RAW (2) #define TTYTYPE_RAS_RAW (2)
struct ipw_tty { struct ipw_tty {
struct tty_port port;
int index; int index;
struct ipw_hardware *hardware; struct ipw_hardware *hardware;
unsigned int channel_idx; unsigned int channel_idx;
@ -51,7 +52,6 @@ struct ipw_tty {
int tty_type; int tty_type;
struct ipw_network *network; struct ipw_network *network;
struct tty_struct *linux_tty; struct tty_struct *linux_tty;
int open_count;
unsigned int control_lines; unsigned int control_lines;
struct mutex ipw_tty_mutex; struct mutex ipw_tty_mutex;
int tx_bytes_queued; int tx_bytes_queued;
@ -100,10 +100,10 @@ static int ipw_open(struct tty_struct *linux_tty, struct file *filp)
mutex_unlock(&tty->ipw_tty_mutex); mutex_unlock(&tty->ipw_tty_mutex);
return -ENODEV; return -ENODEV;
} }
if (tty->open_count == 0) if (tty->port.count == 0)
tty->tx_bytes_queued = 0; tty->tx_bytes_queued = 0;
tty->open_count++; tty->port.count++;
tty->linux_tty = linux_tty; tty->linux_tty = linux_tty;
linux_tty->driver_data = tty; linux_tty->driver_data = tty;
@ -119,9 +119,9 @@ static int ipw_open(struct tty_struct *linux_tty, struct file *filp)
static void do_ipw_close(struct ipw_tty *tty) static void do_ipw_close(struct ipw_tty *tty)
{ {
tty->open_count--; tty->port.count--;
if (tty->open_count == 0) { if (tty->port.count == 0) {
struct tty_struct *linux_tty = tty->linux_tty; struct tty_struct *linux_tty = tty->linux_tty;
if (linux_tty != NULL) { if (linux_tty != NULL) {
@ -142,7 +142,7 @@ static void ipw_hangup(struct tty_struct *linux_tty)
return; return;
mutex_lock(&tty->ipw_tty_mutex); mutex_lock(&tty->ipw_tty_mutex);
if (tty->open_count == 0) { if (tty->port.count == 0) {
mutex_unlock(&tty->ipw_tty_mutex); mutex_unlock(&tty->ipw_tty_mutex);
return; return;
} }
@ -171,7 +171,7 @@ void ipwireless_tty_received(struct ipw_tty *tty, unsigned char *data,
return; return;
} }
if (!tty->open_count) { if (!tty->port.count) {
mutex_unlock(&tty->ipw_tty_mutex); mutex_unlock(&tty->ipw_tty_mutex);
return; return;
} }
@ -213,7 +213,7 @@ static int ipw_write(struct tty_struct *linux_tty,
return -ENODEV; return -ENODEV;
mutex_lock(&tty->ipw_tty_mutex); mutex_lock(&tty->ipw_tty_mutex);
if (!tty->open_count) { if (!tty->port.count) {
mutex_unlock(&tty->ipw_tty_mutex); mutex_unlock(&tty->ipw_tty_mutex);
return -EINVAL; return -EINVAL;
} }
@ -253,7 +253,7 @@ static int ipw_write_room(struct tty_struct *linux_tty)
if (!tty) if (!tty)
return -ENODEV; return -ENODEV;
if (!tty->open_count) if (!tty->port.count)
return -EINVAL; return -EINVAL;
room = IPWIRELESS_TX_QUEUE_SIZE - tty->tx_bytes_queued; room = IPWIRELESS_TX_QUEUE_SIZE - tty->tx_bytes_queued;
@ -295,7 +295,7 @@ static int ipw_chars_in_buffer(struct tty_struct *linux_tty)
if (!tty) if (!tty)
return 0; return 0;
if (!tty->open_count) if (!tty->port.count)
return 0; return 0;
return tty->tx_bytes_queued; return tty->tx_bytes_queued;
@ -376,7 +376,7 @@ static int ipw_tiocmget(struct tty_struct *linux_tty)
if (!tty) if (!tty)
return -ENODEV; return -ENODEV;
if (!tty->open_count) if (!tty->port.count)
return -EINVAL; return -EINVAL;
return get_control_lines(tty); return get_control_lines(tty);
@ -392,7 +392,7 @@ ipw_tiocmset(struct tty_struct *linux_tty,
if (!tty) if (!tty)
return -ENODEV; return -ENODEV;
if (!tty->open_count) if (!tty->port.count)
return -EINVAL; return -EINVAL;
return set_control_lines(tty, set, clear); return set_control_lines(tty, set, clear);
@ -406,7 +406,7 @@ static int ipw_ioctl(struct tty_struct *linux_tty,
if (!tty) if (!tty)
return -ENODEV; return -ENODEV;
if (!tty->open_count) if (!tty->port.count)
return -EINVAL; return -EINVAL;
/* FIXME: Exactly how is the tty object locked here .. */ /* FIXME: Exactly how is the tty object locked here .. */
@ -475,6 +475,7 @@ static int add_tty(int j,
ttys[j]->network = network; ttys[j]->network = network;
ttys[j]->tty_type = tty_type; ttys[j]->tty_type = tty_type;
mutex_init(&ttys[j]->ipw_tty_mutex); mutex_init(&ttys[j]->ipw_tty_mutex);
tty_port_init(&ttys[j]->port);
tty_register_device(ipw_tty_driver, j, NULL); tty_register_device(ipw_tty_driver, j, NULL);
ipwireless_associate_network_tty(network, channel_idx, ttys[j]); ipwireless_associate_network_tty(network, channel_idx, ttys[j]);
@ -561,7 +562,7 @@ void ipwireless_tty_free(struct ipw_tty *tty)
* are gone */ * are gone */
mutex_lock(&ttyj->ipw_tty_mutex); mutex_lock(&ttyj->ipw_tty_mutex);
} }
while (ttyj->open_count) while (ttyj->port.count)
do_ipw_close(ttyj); do_ipw_close(ttyj);
ipwireless_disassociate_network_ttys(network, ipwireless_disassociate_network_ttys(network,
ttyj->channel_idx); ttyj->channel_idx);