diff options
author | Andy Shevchenko <andriy.shevchenko@linux.intel.com> | 2011-10-31 20:12:41 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-31 20:30:56 -0400 |
commit | 55036ba76b2d2fd53b5c00993fcec5ed56e83922 (patch) | |
tree | b6f82d9b9d91bab4424bc04f8f7e664a639dc8dd | |
parent | 66f6958e69d8055277356d3cc2e7a1d734db1755 (diff) |
lib: rename pack_hex_byte() to hex_byte_pack()
As suggested by Andrew Morton in [1] there is better to have most
significant part first in the function name.
[1] https://lkml.org/lkml/2011/9/20/22
There is no functional change.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Cc: Jesper Nilsson <jesper.nilsson@axis.com>
Cc: David Howells <dhowells@redhat.com>
Cc: Koichi Yasutake <yasutake.koichi@jp.panasonic.com>
Cc: Jason Wessel <jason.wessel@windriver.com>
Cc: Mimi Zohar <zohar@us.ibm.com>
Cc: James Morris <jmorris@namei.org>
Cc: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
Cc: "John W. Linville" <linville@tuxdriver.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | include/linux/kernel.h | 7 | ||||
-rw-r--r-- | lib/vsprintf.c | 14 |
2 files changed, 13 insertions, 8 deletions
diff --git a/include/linux/kernel.h b/include/linux/kernel.h index e40c950e1d62..4824f26a0dc2 100644 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h | |||
@@ -372,13 +372,18 @@ extern const char hex_asc[]; | |||
372 | #define hex_asc_lo(x) hex_asc[((x) & 0x0f)] | 372 | #define hex_asc_lo(x) hex_asc[((x) & 0x0f)] |
373 | #define hex_asc_hi(x) hex_asc[((x) & 0xf0) >> 4] | 373 | #define hex_asc_hi(x) hex_asc[((x) & 0xf0) >> 4] |
374 | 374 | ||
375 | static inline char *pack_hex_byte(char *buf, u8 byte) | 375 | static inline char *hex_byte_pack(char *buf, u8 byte) |
376 | { | 376 | { |
377 | *buf++ = hex_asc_hi(byte); | 377 | *buf++ = hex_asc_hi(byte); |
378 | *buf++ = hex_asc_lo(byte); | 378 | *buf++ = hex_asc_lo(byte); |
379 | return buf; | 379 | return buf; |
380 | } | 380 | } |
381 | 381 | ||
382 | static inline char * __deprecated pack_hex_byte(char *buf, u8 byte) | ||
383 | { | ||
384 | return hex_byte_pack(buf, byte); | ||
385 | } | ||
386 | |||
382 | extern int hex_to_bin(char ch); | 387 | extern int hex_to_bin(char ch); |
383 | extern int __must_check hex2bin(u8 *dst, const char *src, size_t count); | 388 | extern int __must_check hex2bin(u8 *dst, const char *src, size_t count); |
384 | 389 | ||
diff --git a/lib/vsprintf.c b/lib/vsprintf.c index c1a3927326eb..993599e66e5a 100644 --- a/lib/vsprintf.c +++ b/lib/vsprintf.c | |||
@@ -547,7 +547,7 @@ char *mac_address_string(char *buf, char *end, u8 *addr, | |||
547 | } | 547 | } |
548 | 548 | ||
549 | for (i = 0; i < 6; i++) { | 549 | for (i = 0; i < 6; i++) { |
550 | p = pack_hex_byte(p, addr[i]); | 550 | p = hex_byte_pack(p, addr[i]); |
551 | if (fmt[0] == 'M' && i != 5) | 551 | if (fmt[0] == 'M' && i != 5) |
552 | *p++ = separator; | 552 | *p++ = separator; |
553 | } | 553 | } |
@@ -667,13 +667,13 @@ char *ip6_compressed_string(char *p, const char *addr) | |||
667 | lo = word & 0xff; | 667 | lo = word & 0xff; |
668 | if (hi) { | 668 | if (hi) { |
669 | if (hi > 0x0f) | 669 | if (hi > 0x0f) |
670 | p = pack_hex_byte(p, hi); | 670 | p = hex_byte_pack(p, hi); |
671 | else | 671 | else |
672 | *p++ = hex_asc_lo(hi); | 672 | *p++ = hex_asc_lo(hi); |
673 | p = pack_hex_byte(p, lo); | 673 | p = hex_byte_pack(p, lo); |
674 | } | 674 | } |
675 | else if (lo > 0x0f) | 675 | else if (lo > 0x0f) |
676 | p = pack_hex_byte(p, lo); | 676 | p = hex_byte_pack(p, lo); |
677 | else | 677 | else |
678 | *p++ = hex_asc_lo(lo); | 678 | *p++ = hex_asc_lo(lo); |
679 | needcolon = true; | 679 | needcolon = true; |
@@ -695,8 +695,8 @@ char *ip6_string(char *p, const char *addr, const char *fmt) | |||
695 | int i; | 695 | int i; |
696 | 696 | ||
697 | for (i = 0; i < 8; i++) { | 697 | for (i = 0; i < 8; i++) { |
698 | p = pack_hex_byte(p, *addr++); | 698 | p = hex_byte_pack(p, *addr++); |
699 | p = pack_hex_byte(p, *addr++); | 699 | p = hex_byte_pack(p, *addr++); |
700 | if (fmt[0] == 'I' && i != 7) | 700 | if (fmt[0] == 'I' && i != 7) |
701 | *p++ = ':'; | 701 | *p++ = ':'; |
702 | } | 702 | } |
@@ -754,7 +754,7 @@ char *uuid_string(char *buf, char *end, const u8 *addr, | |||
754 | } | 754 | } |
755 | 755 | ||
756 | for (i = 0; i < 16; i++) { | 756 | for (i = 0; i < 16; i++) { |
757 | p = pack_hex_byte(p, addr[index[i]]); | 757 | p = hex_byte_pack(p, addr[index[i]]); |
758 | switch (i) { | 758 | switch (i) { |
759 | case 3: | 759 | case 3: |
760 | case 5: | 760 | case 5: |