diff options
| author | Alexey Dobriyan | 2011-04-15 00:22:02 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2011-04-15 01:06:55 +0200 |
| commit | 78be959e38567f0e020848179a5d64d2b064391a (patch) | |
| tree | 2b6b42edb8ba4f717db5d7a140c77d4993934f0d /lib/kstrtox.c | |
| parent | kstrtox: fix compile warnings in test (diff) | |
| download | kernel-qcow2-linux-78be959e38567f0e020848179a5d64d2b064391a.tar.gz kernel-qcow2-linux-78be959e38567f0e020848179a5d64d2b064391a.tar.xz kernel-qcow2-linux-78be959e38567f0e020848179a5d64d2b064391a.zip | |
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>
Diffstat (limited to 'lib/kstrtox.c')
| -rw-r--r-- | lib/kstrtox.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/lib/kstrtox.c b/lib/kstrtox.c index 05672e819f8c..a235f3cc471c 100644 --- a/lib/kstrtox.c +++ b/lib/kstrtox.c @@ -49,12 +49,9 @@ 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') - break; - else - return -EINVAL; - } else + else if (*s == '\n' && *(s + 1) == '\0') + break; + else return -EINVAL; if (val >= base) |