Messages in this thread Patch in this message | | | From | Peter Hurley <> | Subject | [PATCH 19/19] tty: Touch up style issues in ldisc core | Date | Fri, 27 Nov 2015 16:39:16 -0500 |
| |
Combined declaration/initialization statements that perform substantial or important operations are confusing if separated from the main body by newline; refactor if necessary and remove the newline.
Signed-off-by: Peter Hurley <peter@hurleysoftware.com> --- drivers/tty/tty_ldisc.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-)
diff --git a/drivers/tty/tty_ldisc.c b/drivers/tty/tty_ldisc.c index 4f292d4..3455908 100644 --- a/drivers/tty/tty_ldisc.c +++ b/drivers/tty/tty_ldisc.c @@ -290,7 +290,6 @@ EXPORT_SYMBOL_GPL(tty_ldisc_ref_wait); struct tty_ldisc *tty_ldisc_ref(struct tty_struct *tty) { struct tty_ldisc *ld = NULL; - if (ldsem_down_read_trylock(&tty->ldisc_sem)) { ld = tty->ldisc; if (!ld) @@ -412,7 +411,6 @@ static void __lockfunc tty_ldisc_unlock_pair(struct tty_struct *tty, void tty_ldisc_flush(struct tty_struct *tty) { struct tty_ldisc *ld = tty_ldisc_ref(tty); - tty_buffer_flush(tty, ld); if (ld) tty_ldisc_deref(ld); @@ -430,7 +428,6 @@ EXPORT_SYMBOL_GPL(tty_ldisc_flush); void tty_ldisc_closing(struct tty_struct *tty) { struct tty_ldisc *ld = tty_ldisc_ref(tty); - if (ld) { if (ld->ops->closing) ld->ops->closing(tty); @@ -593,7 +590,6 @@ int tty_set_ldisc(struct tty_struct *tty, int disc) /* Now set up the new line discipline. */ tty->ldisc = new_ldisc; tty_set_termios_ldisc(tty, disc); - retval = tty_ldisc_open(tty, new_ldisc); if (retval < 0) { /* Back to the old one or N_TTY if we can't */ @@ -774,17 +770,14 @@ void tty_ldisc_hangup(struct tty_struct *tty, bool reinit) int tty_ldisc_setup(struct tty_struct *tty, struct tty_struct *o_tty) { - struct tty_ldisc *ld = tty->ldisc; - int retval; - - retval = tty_ldisc_open(tty, ld); + int retval = tty_ldisc_open(tty, tty->ldisc); if (retval) return retval; if (o_tty) { retval = tty_ldisc_open(o_tty, o_tty->ldisc); if (retval) { - tty_ldisc_close(tty, ld); + tty_ldisc_close(tty, tty->ldisc); return retval; } } -- 2.6.3
| |