Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 10334418 authored by Daeseok Youn's avatar Daeseok Youn Committed by Greg Kroah-Hartman
Browse files

staging: dgnc: remove redundant NULL checks in 



The dgnc_block_til_ready() is only used in dgnc_tty_open().
The unit data(struct un_t) was stored into tty->driver_data in dgnc_tty_open().
And also tty and un were tested about NULL so these variables doesn't
need to check for NULL in dgnc_block_til_ready().

Signed-off-by: default avatarDaeseok Youn <daeseok.youn@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 598b1529

drivers/staging/dgnc/dgnc_tty.c

+2 −7
Original line number Diff line number Diff line
@@ -1172,17 +1172,12 @@ static int dgnc_block_til_ready(struct tty_struct *tty, 
				struct channel_t *ch)

{

	int retval = 0;

	struct un_t *un = NULL;

	struct un_t *un = tty->driver_data;

	unsigned long flags;

	uint	old_flags = 0;

	int	sleep_on_un_flags = 0;



	if (!tty || tty->magic != TTY_MAGIC || !file || !ch ||

	    ch->magic != DGNC_CHANNEL_MAGIC)

		return -ENXIO;



	un = tty->driver_data;

	if (!un || un->magic != DGNC_UNIT_MAGIC)

	if (!file)

		return -ENXIO;



	spin_lock_irqsave(&ch->ch_lock, flags);