git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://neil.brown.name/md
[sfrench/cifs-2.6.git]
/
drivers
/
usb
/
gadget
/
u_ether.c
diff --git
a/drivers/usb/gadget/u_ether.c
b/drivers/usb/gadget/u_ether.c
index 1da755a1c855ccff127b8350e375e1ebadad4db7..6bb876d652527b24cda02b7d272252418b2830a4 100644
(file)
--- a/
drivers/usb/gadget/u_ether.c
+++ b/
drivers/usb/gadget/u_ether.c
@@
-704,17
+704,6
@@
static char *host_addr;
module_param(host_addr, charp, S_IRUGO);
MODULE_PARM_DESC(host_addr, "Host Ethernet Address");
module_param(host_addr, charp, S_IRUGO);
MODULE_PARM_DESC(host_addr, "Host Ethernet Address");
-
-static u8 __init nibble(unsigned char c)
-{
- if (isdigit(c))
- return c - '0';
- c = toupper(c);
- if (isxdigit(c))
- return 10 + c - 'A';
- return 0;
-}
-
static int get_ether_addr(const char *str, u8 *dev_addr)
{
if (str) {
static int get_ether_addr(const char *str, u8 *dev_addr)
{
if (str) {
@@
-725,8
+714,8
@@
static int get_ether_addr(const char *str, u8 *dev_addr)
if ((*str == '.') || (*str == ':'))
str++;
if ((*str == '.') || (*str == ':'))
str++;
- num =
nibble
(*str++) << 4;
- num |=
(nibble(*str++)
);
+ num =
hex_to_bin
(*str++) << 4;
+ num |=
hex_to_bin(*str++
);
dev_addr [i] = num;
}
if (is_valid_ether_addr(dev_addr))
dev_addr [i] = num;
}
if (is_valid_ether_addr(dev_addr))