Skip to content

Commit

Permalink
sysctl: don't use own implementation of hex_to_bin()
Browse files Browse the repository at this point in the history
Remove own implementation of hex_to_bin().

Signed-off-by: Andy Shevchenko <ext-andriy.shevchenko@nokia.com>
Cc: Eric W. Biederman <ebiederm@xmission.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
Andy Shevchenko authored and Linus Torvalds committed May 25, 2010
1 parent 96b89f3 commit 69e4469
Showing 1 changed file with 3 additions and 6 deletions.
9 changes: 3 additions & 6 deletions kernel/sysctl_binary.c
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
#include <linux/file.h>
#include <linux/ctype.h>
#include <linux/netdevice.h>
#include <linux/kernel.h>
#include <linux/slab.h>

#ifdef CONFIG_SYSCTL_SYSCALL
Expand Down Expand Up @@ -1124,11 +1125,6 @@ static ssize_t bin_ulongvec(struct file *file,
return result;
}

static unsigned hex_value(int ch)
{
return isdigit(ch) ? ch - '0' : ((ch | 0x20) - 'a') + 10;
}

static ssize_t bin_uuid(struct file *file,
void __user *oldval, size_t oldlen, void __user *newval, size_t newlen)
{
Expand Down Expand Up @@ -1156,7 +1152,8 @@ static ssize_t bin_uuid(struct file *file,
if (!isxdigit(str[0]) || !isxdigit(str[1]))
goto out;

uuid[i] = (hex_value(str[0]) << 4) | hex_value(str[1]);
uuid[i] = (hex_to_bin(str[0]) << 4) |
hex_to_bin(str[1]);
str += 2;
if (*str == '-')
str++;
Expand Down

0 comments on commit 69e4469

Please sign in to comment.