Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

tty: Call methods in modern style

Browse source 
The use of older function ptr calling style, (*fn)(), makes static
analysis more error-prone; replace with modern fn() style.

Signed-off-by: Peter Hurley <peter@hurleysoftware.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Peter Hurley 2014-11-05 12:26:25 -05:00 committed by Greg Kroah-Hartman
parent 1256937f04
commit c961bfb174
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
drivers/tty/tty_io.c
View file

@ -981,7 +981,7 @@ void __stop_tty(struct tty_struct *tty)
return; return;
tty->stopped = 1; tty->stopped = 1;
if (tty->ops->stop) if (tty->ops->stop)
(tty->ops->stop)(tty); tty->ops->stop(tty);
} }
void stop_tty(struct tty_struct *tty) void stop_tty(struct tty_struct *tty)
@ -1012,7 +1012,7 @@ void __start_tty(struct tty_struct *tty)
return; return;
tty->stopped = 0; tty->stopped = 0;
if (tty->ops->start) if (tty->ops->start)
(tty->ops->start)(tty); tty->ops->start(tty);
tty_wakeup(tty); tty_wakeup(tty);
} }
@ -1066,7 +1066,7 @@ static ssize_t tty_read(struct file *file, char __user *buf, size_t count,
situation */ situation */
ld = tty_ldisc_ref_wait(tty); ld = tty_ldisc_ref_wait(tty);
if (ld->ops->read) if (ld->ops->read)
i = (ld->ops->read)(tty, file, buf, count); i = ld->ops->read(tty, file, buf, count);
else else
i = -EIO; i = -EIO;
tty_ldisc_deref(ld); tty_ldisc_deref(ld);
@ -2182,7 +2182,7 @@ static unsigned int tty_poll(struct file *filp, poll_table *wait)
ld = tty_ldisc_ref_wait(tty); ld = tty_ldisc_ref_wait(tty);
if (ld->ops->poll) if (ld->ops->poll)
ret = (ld->ops->poll)(tty, filp, wait); ret = ld->ops->poll(tty, filp, wait);
tty_ldisc_deref(ld); tty_ldisc_deref(ld);
return ret; return ret;
} }
@ -2905,7 +2905,7 @@ long tty_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
break; break;
} }
if (tty->ops->ioctl) { if (tty->ops->ioctl) {
retval = (tty->ops->ioctl)(tty, cmd, arg); retval = tty->ops->ioctl(tty, cmd, arg);
if (retval != -ENOIOCTLCMD) if (retval != -ENOIOCTLCMD)
return retval; return retval;
} }
@ -2932,7 +2932,7 @@ static long tty_compat_ioctl(struct file *file, unsigned int cmd,
return -EINVAL; return -EINVAL;
if (tty->ops->compat_ioctl) { if (tty->ops->compat_ioctl) {
retval = (tty->ops->compat_ioctl)(tty, cmd, arg); retval = tty->ops->compat_ioctl(tty, cmd, arg);
if (retval != -ENOIOCTLCMD) if (retval != -ENOIOCTLCMD)
return retval; return retval;
} }

4
drivers/tty/tty_ioctl.c
View file

@ -550,14 +550,14 @@ int tty_set_termios(struct tty_struct *tty, struct ktermios *new_termios)
unset_locked_termios(&tty->termios, &old_termios, &tty->termios_locked); unset_locked_termios(&tty->termios, &old_termios, &tty->termios_locked);
if (tty->ops->set_termios) if (tty->ops->set_termios)
(*tty->ops->set_termios)(tty, &old_termios); tty->ops->set_termios(tty, &old_termios);
else else
tty_termios_copy_hw(&tty->termios, &old_termios); tty_termios_copy_hw(&tty->termios, &old_termios);
ld = tty_ldisc_ref(tty); ld = tty_ldisc_ref(tty);
if (ld != NULL) { if (ld != NULL) {
if (ld->ops->set_termios) if (ld->ops->set_termios)
(ld->ops->set_termios)(tty, &old_termios); ld->ops->set_termios(tty, &old_termios);
tty_ldisc_deref(ld); tty_ldisc_deref(ld);
} }
up_write(&tty->termios_rwsem); up_write(&tty->termios_rwsem);