iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ipwireless: switch to ->[sg]et_serial()

Browse Source 
Acked-by: David Sterba <dsterba@suse.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro 2018-09-11 22:00:08 -04:00
parent 6fbf958254
commit a7b06fcf2e
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -248,22 +248,29 @@ static int ipw_write_room(struct tty_struct *linux_tty)
return room; return room;
} }
static int ipwireless_get_serial_info(struct ipw_tty *tty, static int ipwireless_get_serial_info(struct tty_struct *linux_tty,
struct serial_struct __user *retinfo) struct serial_struct *ss)
{ {
struct serial_struct tmp; struct ipw_tty *tty = linux_tty->driver_data;
memset(&tmp, 0, sizeof(tmp)); if (!tty)
tmp.type = PORT_UNKNOWN; return -ENODEV;
tmp.line = tty->index;
tmp.baud_base = 115200;
if (copy_to_user(retinfo, &tmp, sizeof(*retinfo))) if (!tty->port.count)
return -EFAULT; return -EINVAL;
ss->type = PORT_UNKNOWN;
ss->line = tty->index;
ss->baud_base = 115200;
return 0; return 0;
} }
static int ipwireless_set_serial_info(struct tty_struct *linux_tty,
struct serial_struct *ss)
{
return 0; /* Keeps the PCMCIA scripts happy. */
}
static int ipw_chars_in_buffer(struct tty_struct *linux_tty) static int ipw_chars_in_buffer(struct tty_struct *linux_tty)
{ {
struct ipw_tty *tty = linux_tty->driver_data; struct ipw_tty *tty = linux_tty->driver_data;
@ -386,15 +393,6 @@ static int ipw_ioctl(struct tty_struct *linux_tty,
return -EINVAL; return -EINVAL;
/* FIXME: Exactly how is the tty object locked here .. */ /* FIXME: Exactly how is the tty object locked here .. */
switch (cmd) {
case TIOCGSERIAL:
return ipwireless_get_serial_info(tty, (void __user *) arg);
case TIOCSSERIAL:
return 0; /* Keeps the PCMCIA scripts happy. */
}
if (tty->tty_type == TTYTYPE_MODEM) { if (tty->tty_type == TTYTYPE_MODEM) {
switch (cmd) { switch (cmd) {
case PPPIOCGCHAN: case PPPIOCGCHAN:
@ -561,6 +559,8 @@ static const struct tty_operations tty_ops = {
.chars_in_buffer = ipw_chars_in_buffer, .chars_in_buffer = ipw_chars_in_buffer,
.tiocmget = ipw_tiocmget, .tiocmget = ipw_tiocmget,
.tiocmset = ipw_tiocmset, .tiocmset = ipw_tiocmset,
.set_serial = ipwireless_set_serial_info,
.get_serial = ipwireless_get_serial_info,
}; };
int ipwireless_tty_init(void) int ipwireless_tty_init(void)