commit 9b37ee75858ce35cf3c0e4724acaf4efabb45687
author Ralf Baechle <ralf@linux-mips.org> Mon Sep 12 14:23:52 2005 -0700
committer David S. Miller <davem@davemloft.net> Mon Sep 12 14:23:52 2005 -0700
tree 5ea2b68ca964fa7c5e64590d7c72b4dd5cc79762
parent 6ddcf626fd0a3cbf410ceb483cb76074ed1c5873

[NETROM/AX.25/ROSE]: Remove useless tests

Remove error tests that have already been performed by the caller.

Signed-off-by: Ralf Baechle DL5RB <ralf@linux-mips.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

net/ax25/af_ax25.c

diff --git a/net/ax25/af_ax25.c b/net/ax25/af_ax25.c
index 17f192b..9c48731 100644
--- a/net/ax25/af_ax25.c
+++ b/net/ax25/af_ax25.c
@@ -1700,11 +1700,7 @@
 	}
 
 	case SIOCGSTAMP:
-		if (sk != NULL) {
-			res = sock_get_timestamp(sk, argp);
-			break;
-	 	}
-		res = -EINVAL;
+		res = sock_get_timestamp(sk, argp);
 		break;
 
 	case SIOCAX25ADDUID:	/* Add a uid to the uid/call map table */

net/netrom/af_netrom.c

diff --git a/net/netrom/af_netrom.c b/net/netrom/af_netrom.c
index f4578c7..02b1ab5 100644
--- a/net/netrom/af_netrom.c
+++ b/net/netrom/af_netrom.c
@@ -1187,9 +1187,7 @@
 	}
 
 	case SIOCGSTAMP:
-		ret = -EINVAL;
-		if (sk != NULL)
-			ret = sock_get_timestamp(sk, argp);
+		ret = sock_get_timestamp(sk, argp);
 		release_sock(sk);
 		return ret;
 

net/rose/af_rose.c

diff --git a/net/rose/af_rose.c b/net/rose/af_rose.c
index 3077878..977f99a 100644
--- a/net/rose/af_rose.c
+++ b/net/rose/af_rose.c
@@ -1256,9 +1256,7 @@
 	}
 
 	case SIOCGSTAMP:
-		if (sk != NULL) 
-			return sock_get_timestamp(sk, (struct timeval __user *)argp);
-		return -EINVAL;
+		return sock_get_timestamp(sk, (struct timeval __user *)argp);
 
 	case SIOCGIFADDR:
 	case SIOCSIFADDR: