tty: fix unused warning when TCGETX is not defined (5dca607b) · Commits · 戴 / test

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> Signed-off-by:

Linus Torvalds <torvalds@linux-foundation.org>

drivers/char/tty_ioctl.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -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:

Admin message