tty: Call methods in modern style

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>

diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c
index 1262368443f45d68efc50412079678f0751f3d3f..01d45fd7d359160195a852413f6b153814a6d306 100644 (file)
--- a/drivers/tty/tty_io.c
+++ b/drivers/tty/tty_io.c
@@ -981,7 +981,7 @@ void __stop_tty(struct tty_struct *tty)
                return;
        tty->stopped = 1;
        if (tty->ops->stop)
-               (tty->ops->stop)(tty);
+               tty->ops->stop(tty);
 }
 
 void stop_tty(struct tty_struct *tty)
@@ -1012,7 +1012,7 @@ void __start_tty(struct tty_struct *tty)
                return;
        tty->stopped = 0;
        if (tty->ops->start)
-               (tty->ops->start)(tty);
+               tty->ops->start(tty);
        tty_wakeup(tty);
 }
 
@@ -1066,7 +1066,7 @@ static ssize_t tty_read(struct file *file, char __user *buf, size_t count,
           situation */
        ld = tty_ldisc_ref_wait(tty);
        if (ld->ops->read)
-               i = (ld->ops->read)(tty, file, buf, count);
+               i = ld->ops->read(tty, file, buf, count);
        else
                i = -EIO;
        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);
        if (ld->ops->poll)
-               ret = (ld->ops->poll)(tty, filp, wait);
+               ret = ld->ops->poll(tty, filp, wait);
        tty_ldisc_deref(ld);
        return ret;
 }
@@ -2905,7 +2905,7 @@ long tty_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
                break;
        }
        if (tty->ops->ioctl) {
-               retval = (tty->ops->ioctl)(tty, cmd, arg);
+               retval = tty->ops->ioctl(tty, cmd, arg);
                if (retval != -ENOIOCTLCMD)
                        return retval;
        }
@@ -2932,7 +2932,7 @@ static long tty_compat_ioctl(struct file *file, unsigned int cmd,
                return -EINVAL;
 
        if (tty->ops->compat_ioctl) {
-               retval = (tty->ops->compat_ioctl)(tty, cmd, arg);
+               retval = tty->ops->compat_ioctl(tty, cmd, arg);
                if (retval != -ENOIOCTLCMD)
                        return retval;
        }

diff --git a/drivers/tty/tty_ioctl.c b/drivers/tty/tty_ioctl.c
index 24a136079d90cb4519f4f943918d4c5e8456af74..1787fa4d9448bfd2428be22cbc9be0aac1f24b1d 100644 (file)
--- a/drivers/tty/tty_ioctl.c
+++ b/drivers/tty/tty_ioctl.c
@@ -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);
 
        if (tty->ops->set_termios)
-               (*tty->ops->set_termios)(tty, &old_termios);
+               tty->ops->set_termios(tty, &old_termios);
        else
                tty_termios_copy_hw(&tty->termios, &old_termios);
 
        ld = tty_ldisc_ref(tty);
        if (ld != NULL) {
                if (ld->ops->set_termios)
-                       (ld->ops->set_termios)(tty, &old_termios);
+                       ld->ops->set_termios(tty, &old_termios);
                tty_ldisc_deref(ld);
        }
        up_write(&tty->termios_rwsem);