sock_get_timeout: drop unnecessary return variable
diff mbox series

Message ID 20191010040824.fbauijiiyyz5dl5y@shells.gnugeneration.com
State Accepted
Delegated to: David Miller
Headers show
Series
  • sock_get_timeout: drop unnecessary return variable
Related show

Commit Message

Vito Caputo Oct. 10, 2019, 4:08 a.m. UTC
Remove pointless use of size return variable by directly returning
sizes.

Signed-off-by: Vito Caputo <vcaputo@pengaru.com>
---
 net/core/sock.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

Comments

David Miller Oct. 12, 2019, 3:45 a.m. UTC | #1
From: Vito Caputo <vcaputo@pengaru.com>
Date: Wed, 9 Oct 2019 21:08:24 -0700

> Remove pointless use of size return variable by directly returning
> sizes.
> 
> Signed-off-by: Vito Caputo <vcaputo@pengaru.com>

Looks good, applied to net-next.

Patch
diff mbox series

diff --git a/net/core/sock.c b/net/core/sock.c
index fac2b4d80de5..e01ff0d3be95 100644
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -333,7 +333,6 @@  EXPORT_SYMBOL(__sk_backlog_rcv);
 static int sock_get_timeout(long timeo, void *optval, bool old_timeval)
 {
 	struct __kernel_sock_timeval tv;
-	int size;
 
 	if (timeo == MAX_SCHEDULE_TIMEOUT) {
 		tv.tv_sec = 0;
@@ -354,13 +353,11 @@  static int sock_get_timeout(long timeo, void *optval, bool old_timeval)
 		old_tv.tv_sec = tv.tv_sec;
 		old_tv.tv_usec = tv.tv_usec;
 		*(struct __kernel_old_timeval *)optval = old_tv;
-		size = sizeof(old_tv);
-	} else {
-		*(struct __kernel_sock_timeval *)optval = tv;
-		size = sizeof(tv);
+		return sizeof(old_tv);
 	}
 
-	return size;
+	*(struct __kernel_sock_timeval *)optval = tv;
+	return sizeof(tv);
 }
 
 static int sock_set_timeout(long *timeo_p, char __user *optval, int optlen, bool old_timeval)