Skip to content

Commit

Permalink
um: Use tty_port_operations->destruct
Browse files Browse the repository at this point in the history
As we setup the SIGWINCH handler in tty_port_operations->activate
it makes sense to tear down it in ->destruct.

Signed-off-by: Richard Weinberger <richard@nod.at>
  • Loading branch information
richardweinberger committed Mar 11, 2013
1 parent 72383d4 commit cc4f024
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 14 deletions.
26 changes: 14 additions & 12 deletions arch/um/drivers/line.c
Original file line number Diff line number Diff line change
Expand Up @@ -315,8 +315,22 @@ static int line_activate(struct tty_port *port, struct tty_struct *tty)
return 0;
}

static void unregister_winch(struct tty_struct *tty);

static void line_destruct(struct tty_port *port)
{
struct tty_struct *tty = tty_port_tty_get(port);
struct line *line = tty->driver_data;

if (line->sigio) {
unregister_winch(tty);
line->sigio = 0;
}
}

static const struct tty_port_operations line_port_ops = {
.activate = line_activate,
.destruct = line_destruct,
};

int line_open(struct tty_struct *tty, struct file *filp)
Expand All @@ -340,18 +354,6 @@ int line_install(struct tty_driver *driver, struct tty_struct *tty,
return 0;
}

static void unregister_winch(struct tty_struct *tty);

void line_cleanup(struct tty_struct *tty)
{
struct line *line = tty->driver_data;

if (line->sigio) {
unregister_winch(tty);
line->sigio = 0;
}
}

void line_close(struct tty_struct *tty, struct file * filp)
{
struct line *line = tty->driver_data;
Expand Down
1 change: 0 additions & 1 deletion arch/um/drivers/ssl.c
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,6 @@ static const struct tty_operations ssl_ops = {
.throttle = line_throttle,
.unthrottle = line_unthrottle,
.install = ssl_install,
.cleanup = line_cleanup,
.hangup = line_hangup,
};

Expand Down
1 change: 0 additions & 1 deletion arch/um/drivers/stdio_console.c
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,6 @@ static const struct tty_operations console_ops = {
.set_termios = line_set_termios,
.throttle = line_throttle,
.unthrottle = line_unthrottle,
.cleanup = line_cleanup,
.hangup = line_hangup,
};

Expand Down

0 comments on commit cc4f024

Please sign in to comment.