lkml.org 
[lkml]   [2009]   [Jun]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4/9] tty: fix unused warning when TCGETX is not defined
    Date
    From: Mike Frysinger <vapier@gentoo.org>

    If TCGETX is not defined, we end up with this warning:
    drivers/char/tty_ioctl.c: In function ‘tty_mode_ioctl’:
    drivers/char/tty_ioctl.c:950: warning: unused variable ‘ktermx’

    Since the variable is only used in one case statement, push it down to
    the local case scope.

    Signed-off-by: Mike Frysinger <vapier@gentoo.org>
    Signed-off-by: Alan Cox <alan@linux.intel.com>
    ---

    drivers/char/tty_ioctl.c | 5 +++--
    1 files changed, 3 insertions(+), 2 deletions(-)


    diff --git a/drivers/char/tty_ioctl.c b/drivers/char/tty_ioctl.c
    index 8116bb1..b24f6c6 100644
    --- a/drivers/char/tty_ioctl.c
    +++ b/drivers/char/tty_ioctl.c
    @@ -947,7 +947,6 @@ int tty_mode_ioctl(struct tty_struct *tty, struct file *file,
    void __user *p = (void __user *)arg;
    int ret = 0;
    struct ktermios kterm;
    - struct termiox ktermx;

    if (tty->driver->type == TTY_DRIVER_TYPE_PTY &&
    tty->driver->subtype == PTY_TYPE_MASTER)
    @@ -1049,7 +1048,8 @@ int tty_mode_ioctl(struct tty_struct *tty, struct file *file,
    return ret;
    #endif
    #ifdef TCGETX
    - case TCGETX:
    + case TCGETX: {
    + struct termiox ktermx;
    if (real_tty->termiox == NULL)
    return -EINVAL;
    mutex_lock(&real_tty->termios_mutex);
    @@ -1058,6 +1058,7 @@ int tty_mode_ioctl(struct tty_struct *tty, struct file *file,
    if (copy_to_user(p, &ktermx, sizeof(struct termiox)))
    ret = -EFAULT;
    return ret;
    + }
    case TCSETX:
    return set_termiox(real_tty, p, 0);
    case TCSETXW:
    --
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2009-06-16 17:05    [W:0.030 / U:91.812 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site