Skip to contentSkip to conversation

TTY cleanups

PATCH New Alan Cox 1 participant 3 messages Jun 23, 2008

Subsystems (2)
TTY layer and serial drivers Char and misc drivers
lore
Share & tools
lore

Alan Cox

author
#0 lore raw

cover TTY cleanups

Two small tty clean ups.

---

Alan Cox (1):
tty_driver: Update required method documentation

Gustavo Fernando Padovan (1):
removed unused var real_tty on n_tty_ioctl()

 drivers/char/tty_ioctl.c   |    7 -------
 include/linux/tty_driver.h |    5 ++---
 2 files changed, 2 insertions(+), 10 deletions(-)
Signature · 3 lines
With trembling hands he unfurled the ancient cracked parchment, this was
the place, it had to be. Uncertainly he began to mumble the chant "rdbms,
sql , third normal form, java,  table, scalable". Something moved..
Quoted 1 line

From outside they heard a scream and a thud. The sales department had awoken

author
#1 lore raw

PATCH 1/2 tty_driver: Update required method documentation

Some of the requirement rules are now more relaxed. Also correct a contradiction in the previous update

Signed-off-by Alan Cox <[email protected]>

---

 include/linux/tty_driver.h |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)
include/linux/tty_driver.h +2 -3
index 59f1c0b..d2a0035 100644
@@ -27,8 +27,7 @@
  * 	This routine is called by the kernel to write a series of
  * 	characters to the tty device.  The characters may come from
  * 	user space or kernel space.  This routine will return the
- *	number of characters actually accepted for writing.  This
- *	routine is mandatory.
+ *	number of characters actually accepted for writing.
  *
  *	Optional: Required for writable devices.
  *

@@ -134,7 +133,7 @@
  * 	This routine notifies the tty driver that it should hangup the
  * 	tty device.
  *
- *	Required:
+ *	Optional:
  *
  * void (*break_ctl)(struct tty_stuct *tty, int state);
  *
author
#2 lore raw

PATCH 2/2 removed unused var real_tty on n_tty_ioctl()

In reply to Alan Cox

From: Gustavo Fernando Padovan <[email protected]>

Hello,

I noted that the 'struct tty_struct *real_tty' is not used in this function, so I removed the code about 'real_tty'. This little change is on kernel 2.6.25.4, but aplies on 2.6.24 or greater.

Signed-off-by Gustavo Fernando Padovan <[email protected]>
Acked-by Alan Cox <[email protected]>

---

 drivers/char/tty_ioctl.c |    7 -------
 1 files changed, 0 insertions(+), 7 deletions(-)
drivers/char/tty_ioctl.c +0 -7
index b1a757a..8f81139 100644
@@ -981,16 +981,9 @@ EXPORT_SYMBOL_GPL(tty_perform_flush);
 int n_tty_ioctl(struct tty_struct *tty, struct file *file,
 		       unsigned int cmd, unsigned long arg)
 {
-	struct tty_struct *real_tty;
 	unsigned long flags;
 	int retval;
 
-	if (tty->driver->type == TTY_DRIVER_TYPE_PTY &&
-	    tty->driver->subtype == PTY_TYPE_MASTER)
-		real_tty = tty->link;
-	else
-		real_tty = tty;
-
 	switch (cmd) {
 	case TCXONC:
 		retval = tty_check_change(tty);