From f83bb2d40a879c21c5085ee8cfc426f9936901ee Mon Sep 17 00:00:00 2001 From: Jiri Slaby Date: Thu, 7 Feb 2008 00:16:44 -0800 Subject: Char: mxser, simplify mxser_get_serial_info Initialize temp structure directly with proper values without first zeroing it and setting later as suggested by Jan. Signed-off-by: Jiri Slaby Cc: Jan Engelhardt Reviewed-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- drivers/char/mxser_new.c | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) (limited to 'drivers/char') diff --git a/drivers/char/mxser_new.c b/drivers/char/mxser_new.c index 9449fba80faa..937c101db905 100644 --- a/drivers/char/mxser_new.c +++ b/drivers/char/mxser_new.c @@ -1168,21 +1168,18 @@ static void mxser_flush_buffer(struct tty_struct *tty) static int mxser_get_serial_info(struct mxser_port *info, struct serial_struct __user *retinfo) { - struct serial_struct tmp; - - if (!retinfo) - return -EFAULT; - memset(&tmp, 0, sizeof(tmp)); - tmp.type = info->type; - tmp.line = info->tty->index; - tmp.port = info->ioaddr; - tmp.irq = info->board->irq; - tmp.flags = info->flags; - tmp.baud_base = info->baud_base; - tmp.close_delay = info->close_delay; - tmp.closing_wait = info->closing_wait; - tmp.custom_divisor = info->custom_divisor; - tmp.hub6 = 0; + struct serial_struct tmp = { + .type = info->type, + .line = info->tty->index, + .port = info->ioaddr, + .irq = info->board->irq, + .flags = info->flags, + .baud_base = info->baud_base, + .close_delay = info->close_delay, + .closing_wait = info->closing_wait, + .custom_divisor = info->custom_divisor, + .hub6 = 0 + }; if (copy_to_user(retinfo, &tmp, sizeof(*retinfo))) return -EFAULT; return 0; -- cgit v1.2.3