Skip to contentSkip to conversation

Remove useless tests

PATCH In review Ralf Baechle DL5RB 1 participant 1 message Sep 11, 2005

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 4/12 Remove useless tests

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

 net/ax25/af_ax25.c     |    6 +-----
 net/netrom/af_netrom.c |    4 +---
 net/rose/af_rose.c     |    4 +---
 3 files changed, 3 insertions(+), 11 deletions(-)
net/netrom/af_netrom.c +1 -3
Index: linux-cvs/net/netrom/af_netrom.c
===================================================================
@@ -1187,9 +1187,7 @@ static int nr_ioctl(struct socket *sock,
 	}
 
 	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/ax25/af_ax25.c +1 -5
Index: linux-cvs/net/ax25/af_ax25.c
===================================================================
@@ -1700,11 +1700,7 @@ static int ax25_ioctl(struct socket *soc
 	}
 
 	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/rose/af_rose.c +1 -3
Index: linux-cvs/net/rose/af_rose.c
===================================================================
@@ -1256,9 +1256,7 @@ static int rose_ioctl(struct socket *soc
 	}
 
 	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: