Since tty_standard_install() always returns 0, the return type has changed to void. Now apply this and remove the obsolete error check.
Signed-off-by: Jaejoong Kim climbbb.kim@gmail.com --- drivers/staging/fwserial/fwserial.c | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-)
diff --git a/drivers/staging/fwserial/fwserial.c b/drivers/staging/fwserial/fwserial.c index fa0dd42..5134019 100644 --- a/drivers/staging/fwserial/fwserial.c +++ b/drivers/staging/fwserial/fwserial.c @@ -1064,27 +1064,21 @@ static void fwtty_cleanup(struct tty_struct *tty) static int fwtty_install(struct tty_driver *driver, struct tty_struct *tty) { struct fwtty_port *port = fwtty_port_get(tty->index); - int err;
- err = tty_standard_install(driver, tty); - if (!err) - tty->driver_data = port; - else - fwtty_port_put(port); - return err; + tty_standard_install(driver, tty); + tty->driver_data = port; + + return 0; }
static int fwloop_install(struct tty_driver *driver, struct tty_struct *tty) { struct fwtty_port *port = fwtty_port_get(table_idx(tty->index)); - int err;
- err = tty_standard_install(driver, tty); - if (!err) - tty->driver_data = port; - else - fwtty_port_put(port); - return err; + tty_standard_install(driver, tty); + tty->driver_data = port; + + return 0; }
static int fwtty_write(struct tty_struct *tty, const unsigned char *buf, int c)