staging: dgap: removes redundant null check and change paramter for dgap_tty_digisetc...

Null checks in dgap_tty_digisetcustombaud() are already done by
dgap_tty_ioctl() and change "tty" as a paramter of this function
to "ch", "bd and "un".

Signed-off-by: Daeseok Youn <daeseok.youn@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/dgap/dgap.c b/drivers/staging/dgap/dgap.c
index 3b769585af617f59b2c2bfb08ebf7655b6aae755..32988a8aead467f8a61cdfdc3fbb15ddbff8d6a1 100644 (file)
--- a/drivers/staging/dgap/dgap.c
+++ b/drivers/staging/dgap/dgap.c
@@ -106,8 +106,8 @@ static int dgap_set_modem_info(struct channel_t *ch, struct board_t *bd, struct
                               unsigned int command, unsigned int __user *value);
 static int dgap_get_modem_info(struct channel_t *ch,
                                unsigned int __user *value);
-static int dgap_tty_digisetcustombaud(struct tty_struct *tty,
-                               int __user *new_info);
+static int dgap_tty_digisetcustombaud(struct channel_t *ch, struct board_t *bd,
+                                     struct un_t *un, int __user *new_info);
 static int dgap_tty_digigetcustombaud(struct channel_t *ch, struct un_t *un,
                                      int __user *retinfo);
 static int dgap_tty_tiocmget(struct tty_struct *tty);
@@ -3344,32 +3344,13 @@ static int dgap_tty_digigetcustombaud(struct channel_t *ch, struct un_t *un,
  *
  * Ioctl to set the custom baud rate setting
  */
-static int dgap_tty_digisetcustombaud(struct tty_struct *tty,
-                                       int __user *new_info)
+static int dgap_tty_digisetcustombaud(struct channel_t *ch, struct board_t *bd,
+                                     struct un_t *un, int __user *new_info)
 {
-       struct board_t *bd;
-       struct channel_t *ch;
-       struct un_t *un;
        uint new_rate;
        ulong lock_flags;
        ulong lock_flags2;
 
-       if (!tty || tty->magic != TTY_MAGIC)
-               return -EFAULT;
-
-       un = tty->driver_data;
-       if (!un || un->magic != DGAP_UNIT_MAGIC)
-               return -EFAULT;
-
-       ch = un->un_ch;
-       if (!ch || ch->magic != DGAP_CHANNEL_MAGIC)
-               return -EFAULT;
-
-       bd = ch->ch_bd;
-       if (!bd || bd->magic != DGAP_BOARD_MAGIC)
-               return -EFAULT;
-
-
        if (copy_from_user(&new_rate, new_info, sizeof(unsigned int)))
                return -EFAULT;
 
@@ -4040,7 +4021,7 @@ static int dgap_tty_ioctl(struct tty_struct *tty, unsigned int cmd,
        case DIGI_SETCUSTOMBAUD:
                spin_unlock_irqrestore(&ch->ch_lock, lock_flags2);
                spin_unlock_irqrestore(&bd->bd_lock, lock_flags);
-               return dgap_tty_digisetcustombaud(tty, uarg);
+               return dgap_tty_digisetcustombaud(ch, bd, un, uarg);
 
        case DIGI_RESET_PORT:
                dgap_firmware_reset_port(ch);