Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1265160

[PATCH 09/14] tty: core: Refactor parameters for unset_locked_termios() helper

Show all headers | View raw

Add tty as parameter to unset_locked_termios() and extract former
parameters, termios and locked, as locals.

Signed-off-by: Peter Hurley <peter@hurleysoftware.com>
---
 drivers/tty/tty_ioctl.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/tty/tty_ioctl.c b/drivers/tty/tty_ioctl.c
index 9c5aebf..40d91a3 100644
--- a/drivers/tty/tty_ioctl.c
+++ b/drivers/tty/tty_ioctl.c
@@ -239,10 +239,10 @@ EXPORT_SYMBOL(tty_wait_until_sent);
  *		Termios Helper Methods
  */
 
-static void unset_locked_termios(struct ktermios *termios,
-				 struct ktermios *old,
-				 struct ktermios *locked)
+static void unset_locked_termios(struct tty_struct *tty, struct ktermios *old)
 {
+	struct ktermios *termios = &tty->termios;
+	struct ktermios *locked  = &tty->termios_locked;
 	int	i;
 
 #define NOSET_MASK(x, y, z) (x = ((x) & ~(z)) | ((y) & (z)))
@@ -556,7 +556,7 @@ int tty_set_termios(struct tty_struct *tty, struct ktermios *new_termios)
 	down_write(&tty->termios_rwsem);
 	old_termios = tty->termios;
 	tty->termios = *new_termios;
-	unset_locked_termios(&tty->termios, &old_termios, &tty->termios_locked);
+	unset_locked_termios(tty, &old_termios);
 
 	if (tty->ops->set_termios)
 		tty->ops->set_termios(tty, &old_termios);
-- 
2.6.3

--
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/

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 00/14] tty core printk cleanup Peter Hurley <peter@hurleysoftware.com> - 2015-11-08 19:10 +0100
  [PATCH 06/14] tty: Define tty_*() printk macros Peter Hurley <peter@hurleysoftware.com> - 2015-11-08 19:10 +0100
  [PATCH 03/14] tty: synclink_gt: Rename tty_driver_name Peter Hurley <peter@hurleysoftware.com> - 2015-11-08 19:10 +0100
  [PATCH 01/14] tty: Improve tty_debug() macro Peter Hurley <peter@hurleysoftware.com> - 2015-11-08 19:10 +0100
    Re: [PATCH 01/14] tty: Improve tty_debug() macro Joe Perches <joe@perches.com> - 2015-11-08 20:00 +0100
      Re: [PATCH 01/14] tty: Improve tty_debug() macro Joe Perches <joe@perches.com> - 2015-11-08 20:40 +0100
      Re: [PATCH 01/14] tty: Improve tty_debug() macro Peter Hurley <peter@hurleysoftware.com> - 2015-11-08 20:40 +0100
  [PATCH 12/14] tty: Remove __func__ from tty_debug() macro Peter Hurley <peter@hurleysoftware.com> - 2015-11-08 19:10 +0100
  [PATCH 10/14] tty: Remove unset_locked_termios() error message Peter Hurley <peter@hurleysoftware.com> - 2015-11-08 19:10 +0100
  [PATCH 05/14] tty: core: Add helper fn to deref tty driver name Peter Hurley <peter@hurleysoftware.com> - 2015-11-08 19:10 +0100
  [PATCH 14/14] tty: core: Prefer dev_dbg() over pr_debug() Peter Hurley <peter@hurleysoftware.com> - 2015-11-08 19:10 +0100
  [PATCH 08/14] tty: core: Add driver name to invalid device registration message Peter Hurley <peter@hurleysoftware.com> - 2015-11-08 19:10 +0100
  [PATCH 13/14] tty: Merge conditional + error message + WARN_ON() Peter Hurley <peter@hurleysoftware.com> - 2015-11-08 19:10 +0100
  [PATCH 09/14] tty: core: Refactor parameters for unset_locked_termios() helper Peter Hurley <peter@hurleysoftware.com> - 2015-11-08 19:10 +0100
  [PATCH 11/14] tty: core: Prefer pr_* to printk(*) Peter Hurley <peter@hurleysoftware.com> - 2015-11-08 19:10 +0100

csiph-web