diff options
| author | Daeseok Youn <daeseok.youn@gmail.com> | 2014-07-11 19:22:58 +0900 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-07-11 17:35:45 -0700 |
| commit | ffc11c103ac5ba2fa06794be5667fbd183bff056 (patch) | |
| tree | 2fe3616777290672f741bab716c8a392022d21f3 /drivers/staging/dgap | |
| parent | ab6cdcb4261e0d697292a516452904bc6c7e8404 (diff) | |
| download | op-kernel-dev-ffc11c103ac5ba2fa06794be5667fbd183bff056.zip op-kernel-dev-ffc11c103ac5ba2fa06794be5667fbd183bff056.tar.gz | |
staging: dgap: removes redundant null check and change paramter for dgap_tty_digiseta()
Null checks in dgap_tty_digiseta() are already done by
dgap_tty_ioctl() and change "tty" as a paramter of this function
to "ch" and "bd" which are used in dgap_tty_digiseta().
Signed-off-by: Daeseok Youn <daeseok.youn@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/dgap')
| -rw-r--r-- | drivers/staging/dgap/dgap.c | 28 |
1 files changed, 5 insertions, 23 deletions
diff --git a/drivers/staging/dgap/dgap.c b/drivers/staging/dgap/dgap.c index 4e5b594..160a960 100644 --- a/drivers/staging/dgap/dgap.c +++ b/drivers/staging/dgap/dgap.c @@ -88,8 +88,8 @@ static int dgap_tty_ioctl(struct tty_struct *tty, unsigned int cmd, unsigned long arg); static int dgap_tty_digigeta(struct tty_struct *tty, struct digi_t __user *retinfo); -static int dgap_tty_digiseta(struct tty_struct *tty, - struct digi_t __user *new_info); +static int dgap_tty_digiseta(struct channel_t *ch, struct board_t *bd, + struct un_t *un, struct digi_t __user *new_info); static int dgap_tty_digigetedelay(struct tty_struct *tty, int __user *retinfo); static int dgap_tty_digisetedelay(struct tty_struct *tty, int __user *new_info); static int dgap_tty_write_room(struct tty_struct *tty); @@ -3231,31 +3231,13 @@ static int dgap_tty_digigeta(struct tty_struct *tty, * * */ -static int dgap_tty_digiseta(struct tty_struct *tty, - struct digi_t __user *new_info) +static int dgap_tty_digiseta(struct channel_t *ch, struct board_t *bd, + struct un_t *un, struct digi_t __user *new_info) { - struct board_t *bd; - struct channel_t *ch; - struct un_t *un; struct digi_t new_digi; ulong lock_flags = 0; unsigned long 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_digi, new_info, sizeof(struct digi_t))) return -EFAULT; @@ -4100,7 +4082,7 @@ static int dgap_tty_ioctl(struct tty_struct *tty, unsigned int cmd, case DIGI_SETA: spin_unlock_irqrestore(&ch->ch_lock, lock_flags2); spin_unlock_irqrestore(&bd->bd_lock, lock_flags); - return dgap_tty_digiseta(tty, uarg); + return dgap_tty_digiseta(ch, bd, un, uarg); case DIGI_GEDELAY: spin_unlock_irqrestore(&ch->ch_lock, lock_flags2); |
