lkml.org 
[lkml]   [2014]   [Jul]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subject[PATCH 5/9] staging: dgap: removes redundant null check and change paramter for dgap_tty_digigeta()
Null checks in dgap_tty_digigeta() are already done by
dgap_tty_ioctl() and change "tty" as a paramter of this function
to "ch" and "un".

Signed-off-by: Daeseok Youn <daeseok.youn@gmail.com>
---
drivers/staging/dgap/dgap.c | 23 +++++------------------
1 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/drivers/staging/dgap/dgap.c b/drivers/staging/dgap/dgap.c
index 160a960..7ebbf50 100644
--- a/drivers/staging/dgap/dgap.c
+++ b/drivers/staging/dgap/dgap.c
@@ -86,8 +86,8 @@ static int dgap_block_til_ready(struct tty_struct *tty, struct file *file,
struct channel_t *ch);
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_digigeta(struct channel_t *ch, struct un_t *un,
+ struct digi_t __user *retinfo);
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);
@@ -3189,28 +3189,15 @@ static int dgap_set_modem_info(struct tty_struct *tty, unsigned int command,
*
*
*/
-static int dgap_tty_digigeta(struct tty_struct *tty,
- struct digi_t __user *retinfo)
+static int dgap_tty_digigeta(struct channel_t *ch, struct un_t *un,
+ struct digi_t __user *retinfo)
{
- struct channel_t *ch;
- struct un_t *un;
struct digi_t tmp;
ulong lock_flags;

if (!retinfo)
return -EFAULT;

- 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;
-
memset(&tmp, 0, sizeof(tmp));

spin_lock_irqsave(&ch->ch_lock, lock_flags);
@@ -4060,7 +4047,7 @@ static int dgap_tty_ioctl(struct tty_struct *tty, unsigned int cmd,
/* get information for ditty */
spin_unlock_irqrestore(&ch->ch_lock, lock_flags2);
spin_unlock_irqrestore(&bd->bd_lock, lock_flags);
- return dgap_tty_digigeta(tty, uarg);
+ return dgap_tty_digigeta(ch, un, uarg);

case DIGI_SETAW:
case DIGI_SETAF:
--
1.7.1


\
 
 \ /
  Last update: 2014-07-11 13:01    [W:0.023 / U:2.932 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site