Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1396653

[PATCH 2/7] net: ircomm, cleanup TIOCGSERIAL

Show all headers | View raw

In ircomm_tty_get_serial_info, struct serial_struct is memset to 0 and
then some members set to 0 explicitly.

Remove the latter as it is obviously superfluous.

And remove the retinfo check against NULL. copy_to_user will take care
of that.

Part of hub6 cleanup series.

Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Cc: Samuel Ortiz <samuel@sortiz.org>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: netdev@vger.kernel.org
---
 net/irda/ircomm/ircomm_tty_ioctl.c | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/net/irda/ircomm/ircomm_tty_ioctl.c b/net/irda/ircomm/ircomm_tty_ioctl.c
index 17c49bf26313..0985588c9dec 100644
--- a/net/irda/ircomm/ircomm_tty_ioctl.c
+++ b/net/irda/ircomm/ircomm_tty_ioctl.c
@@ -246,9 +246,6 @@ static int ircomm_tty_get_serial_info(struct ircomm_tty_cb *self,
 {
 	struct serial_struct info;
 
-	if (!retinfo)
-		return -EFAULT;
-
 	memset(&info, 0, sizeof(info));
 	info.line = self->line;
 	info.flags = self->port.flags;
@@ -258,11 +255,6 @@ static int ircomm_tty_get_serial_info(struct ircomm_tty_cb *self,
 
 	/* For compatibility  */
 	info.type = PORT_16550A;
-	info.port = 0;
-	info.irq = 0;
-	info.xmit_fifo_size = 0;
-	info.hub6 = 0;
-	info.custom_divisor = 0;
 
 	if (copy_to_user(retinfo, &info, sizeof(*retinfo)))
 		return -EFAULT;
-- 
2.8.2

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 1/7] tty: ipwireless, cleanup TIOCGSERIAL Jiri Slaby <jslaby@suse.cz> - 2016-05-09 09:20 +0200
  [PATCH 5/7] tty: stop defining STD_COM_FLAGS in drivers Jiri Slaby <jslaby@suse.cz> - 2016-05-09 09:20 +0200
  [PATCH 2/7] net: ircomm, cleanup TIOCGSERIAL Jiri Slaby <jslaby@suse.cz> - 2016-05-09 09:20 +0200
    Re: [PATCH 2/7] net: ircomm, cleanup TIOCGSERIAL David Miller <davem@davemloft.net> - 2016-05-10 20:20 +0200
  [PATCH 6/7] tty: 8250, drop unused members from struct old_serial_port Jiri Slaby <jslaby@suse.cz> - 2016-05-09 09:20 +0200
  [PATCH 7/7] tty: 8250, kill DEBUG_INTR Jiri Slaby <jslaby@suse.cz> - 2016-05-09 09:20 +0200
  [PATCH 4/7] tty: frv, remove unused serial macros Jiri Slaby <jslaby@suse.cz> - 2016-05-09 09:20 +0200
  [PATCH 3/7] tty: cyclades+mxser, do not initialize to zero Jiri Slaby <jslaby@suse.cz> - 2016-05-09 09:20 +0200
  Re: [PATCH 1/7] tty: ipwireless, cleanup TIOCGSERIAL David Sterba <dsterba@suse.cz> - 2016-05-09 09:40 +0200

csiph-web