staging: dgnc: remove redundant NULL checks in
authorDaeseok Youn <daeseok.youn@gmail.com>
Wed, 6 Jul 2016 06:11:13 +0000 (15:11 +0900)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 15 Aug 2016 17:06:09 +0000 (19:06 +0200)
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: Daeseok Youn <daeseok.youn@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/dgnc/dgnc_tty.c

index 4eeecc992a02e3e60492d807f082e6e304fe5877..6758859ce5649375c991294c46088e4f40d451c4 100644 (file)
@@ -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);