2020-09-21 13:13:52

by Qinglang Miao

Subject: [PATCH -next] s390/3215: simplify the return expression of tty3215_open()

Simplify the return expression.

Signed-off-by: Qinglang Miao <[email protected]>
---
drivers/s390/char/con3215.c | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/drivers/s390/char/con3215.c b/drivers/s390/char/con3215.c
index 92757f9bd..d8acabbb1 100644
--- a/drivers/s390/char/con3215.c
+++ b/drivers/s390/char/con3215.c
@@ -978,7 +978,6 @@ static int tty3215_install(struct tty_driver *driver, struct tty_struct *tty)
static int tty3215_open(struct tty_struct *tty, struct file * filp)
{
struct raw3215_info *raw = tty->driver_data;
- int retval;

tty_port_tty_set(&raw->port, tty);

@@ -986,11 +985,7 @@ static int tty3215_open(struct tty_struct *tty, struct file * filp)
/*
* Start up 3215 device
*/
- retval = raw3215_startup(raw);
- if (retval)
- return retval;
-
- return 0;
+ return raw3215_startup(raw);
}

/*
--
2.23.0

2020-09-26 12:49:11

by Vasily Gorbik

Subject: Re: [PATCH -next] s390/3215: simplify the return expression of tty3215_open()

On Mon, Sep 21, 2020 at 09:11:01PM +0800, Qinglang Miao wrote:
> Simplify the return expression.
>
> Signed-off-by: Qinglang Miao <[email protected]>
> ---
> drivers/s390/char/con3215.c | 7 +------
> 1 file changed, 1 insertion(+), 6 deletions(-)
>
> diff --git a/drivers/s390/char/con3215.c b/drivers/s390/char/con3215.c
> index 92757f9bd..d8acabbb1 100644
> --- a/drivers/s390/char/con3215.c
> +++ b/drivers/s390/char/con3215.c
> @@ -978,7 +978,6 @@ static int tty3215_install(struct tty_driver *driver, struct tty_struct *tty)
> static int tty3215_open(struct tty_struct *tty, struct file * filp)
> {
> struct raw3215_info *raw = tty->driver_data;
> - int retval;
>
> tty_port_tty_set(&raw->port, tty);
>
> @@ -986,11 +985,7 @@ static int tty3215_open(struct tty_struct *tty, struct file * filp)
> /*
> * Start up 3215 device
> */
> - retval = raw3215_startup(raw);
> - if (retval)
> - return retval;
> -
> - return 0;
> + return raw3215_startup(raw);
> }

Applied, thank you.