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 <[email protected]>
---
drivers/staging/dgap/dgap.c | 29 +++++------------------------
1 files changed, 5 insertions(+), 24 deletions(-)
diff --git a/drivers/staging/dgap/dgap.c b/drivers/staging/dgap/dgap.c
index 3b76958..32988a8 100644
--- 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);
--
1.7.1
Looks good to me. You should be CC'ing Mark as well. He's in
MAINTAINERS now.
I wish the two of you would CC each other and review each other's work.
Daeseok, add yourself to the MAINTAINERS file for this driver as well so
everyone CC's you on their dgap patches. You're doing good work.
regards,
dan carpenter
Hi, Dan
2014-07-11 22:20 GMT+09:00, Dan Carpenter <[email protected]>:
> Looks good to me. You should be CC'ing Mark as well. He's in
> MAINTAINERS now.
I'd added Mark to cc list. All of maintainers including open mailing
lists from get_maintainer.pl were added in my patches. :-)
>
> I wish the two of you would CC each other and review each other's work.
I would like to review dgap patches.
>
> Daeseok, add yourself to the MAINTAINERS file for this driver as well so
> everyone CC's you on their dgap patches. You're doing good work.
Really? :o
Can I modify the MAINTAINERS file for adding myself?
Thank you very much!!
Regards,
Daeseok Youn.
> regards,
> dan carpenter
>
>
On Sat, Jul 12, 2014 at 12:23:16AM +0900, DaeSeok Youn wrote:
> Can I modify the MAINTAINERS file for adding myself?
Yes. Just send a patch to add yourself.
git log -p MAINTAINERS
regards,
dan carpenter
2014-07-12 0:37 GMT+09:00, Dan Carpenter <[email protected]>:
> On Sat, Jul 12, 2014 at 12:23:16AM +0900, DaeSeok Youn wrote:
>> Can I modify the MAINTAINERS file for adding myself?
>
> Yes. Just send a patch to add yourself.
OK. I will.
Thanks.
Regards,
Daeseok Youn.
>
> git log -p MAINTAINERS
>
> regards,
> dan carpenter
>
>