Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 78be959e authored by Alexey Dobriyan's avatar Alexey Dobriyan Committed by Linus Torvalds
Browse files

kstrtox: simpler code in _kstrtoull() 



Signed-off-by: default avatarAlexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 01eda2e0

lib/kstrtox.c

+3 −6
Original line number Diff line number Diff line
@@ -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;