kstrtox: simpler code in _kstrtoull()

Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

lib/kstrtox.c

@@ -49,13 +49,10 @@ static int _kstrtoull(const char *s, unsigned int base, unsigned long long *res)
 			val = *s - '0';
 		else if ('a' <= _tolower(*s) && _tolower(*s) <= 'f')
 			val = _tolower(*s) - 'a' + 10;
-		else if (*s == '\n') {
-			if (*(s + 1) == '\0')
+		else if (*s == '\n' && *(s + 1) == '\0')
 			break;
 		else
 			return -EINVAL;
-		} else
-			return -EINVAL;
 
 		if (val >= base)
 			return -EINVAL;