aboutsummaryrefslogtreecommitdiffstats
path: root/lib/vsprintf.c
diff options
context:
space:
mode:
authorHarvey Harrison <harvey.harrison@gmail.com>2008-10-29 15:53:10 -0400
committerDavid S. Miller <davem@davemloft.net>2008-10-29 15:53:10 -0400
commit6b9a1066f8d4c57c1b778affd91fc38e1121b6f8 (patch)
tree6dd772a39de80c2eef621f40e307156fcb1ec2a8 /lib/vsprintf.c
parent5b095d98928fdb9e3b75be20a54b7a6cbf6ca9ad (diff)
printk: remove %p6 format specifier, fix up comments
Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'lib/vsprintf.c')
-rw-r--r--lib/vsprintf.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/lib/vsprintf.c b/lib/vsprintf.c
index a8630063d14d..dd7cc7fa3e77 100644
--- a/lib/vsprintf.c
+++ b/lib/vsprintf.c
@@ -649,9 +649,7 @@ static char *ip4_addr_string(char *buf, char *end, u8 *addr, int field_width,
649 * - 'I' [46] for IPv4/IPv6 addresses printed in the usual way (dot-separated 649 * - 'I' [46] for IPv4/IPv6 addresses printed in the usual way (dot-separated
650 * decimal for v4 and colon separated network-order 16 bit hex for v6) 650 * decimal for v4 and colon separated network-order 16 bit hex for v6)
651 * - 'i' [46] for 'raw' IPv4/IPv6 addresses, IPv6 omits the colons, IPv4 is 651 * - 'i' [46] for 'raw' IPv4/IPv6 addresses, IPv6 omits the colons, IPv4 is
652 currently the same 652 * currently the same
653 * - '6' For a IPv6 address prints the address in network-ordered 16 bit hex
654 * with colon separators
655 * 653 *
656 * Note: The difference between 'S' and 'F' is that on ia64 and ppc64 654 * Note: The difference between 'S' and 'F' is that on ia64 and ppc64
657 * function pointers are really function descriptors, which contain a 655 * function pointers are really function descriptors, which contain a
@@ -669,8 +667,6 @@ static char *pointer(const char *fmt, char *buf, char *end, void *ptr, int field
669 return resource_string(buf, end, ptr, field_width, precision, flags); 667 return resource_string(buf, end, ptr, field_width, precision, flags);
670 case 'M': 668 case 'M':
671 return mac_address_string(buf, end, ptr, field_width, precision, flags); 669 return mac_address_string(buf, end, ptr, field_width, precision, flags);
672 case '6':
673 return ip6_addr_string(buf, end, ptr, field_width, precision, flags);
674 case 'i': 670 case 'i':
675 flags |= SPECIAL; 671 flags |= SPECIAL;
676 /* Fallthrough */ 672 /* Fallthrough */