5 files changed, 5 insertions, 8 deletions

diff --git a/drivers/firmware/iscsi_ibft.c b/drivers/firmware/iscsi_ibft.c
index 4353414a0b77..0a6472097a81 100644
--- a/drivers/firmware/iscsi_ibft.c
+++ b/drivers/firmware/iscsi_ibft.c
@@ -290,9 +290,7 @@ static ssize_t sprintf_ipaddr(char *buf, u8 *ip)
                 /*
                  * IPv6
                  */
-                str += sprintf(str, NIP6_FMT, ntohs(ip[0]), ntohs(ip[1]),
-                               ntohs(ip[2]), ntohs(ip[3]), ntohs(ip[4]),
-                               ntohs(ip[5]), ntohs(ip[6]), ntohs(ip[7]));
+                str += sprintf(str, "%p6", ip);
         }
         str += sprintf(str, "\n");
         return str - buf;
diff --git a/drivers/scsi/iscsi_tcp.c b/drivers/scsi/iscsi_tcp.c
index ed6c54cae7b1..ef929aef7c12 100644
--- a/drivers/scsi/iscsi_tcp.c
+++ b/drivers/scsi/iscsi_tcp.c
@@ -1608,7 +1608,7 @@ static int iscsi_tcp_get_addr(struct iscsi_conn *conn, struct socket *sock,
         case AF_INET6:
                 sin6 = (struct sockaddr_in6 *)addr;
                 spin_lock_bh(&conn->session->lock);
-                sprintf(buf, NIP6_FMT, NIP6(sin6->sin6_addr));
+                sprintf(buf, "%p6", &sin6->sin6_addr);
                 *port = be16_to_cpu(sin6->sin6_port);
                 spin_unlock_bh(&conn->session->lock);
                 break;
diff --git a/fs/lockd/host.c b/fs/lockd/host.c
index 9fd8889097b7..344e6b475e05 100644
--- a/fs/lockd/host.c
+++ b/fs/lockd/host.c
@@ -122,7 +122,7 @@ static void nlm_display_address(const struct sockaddr *sap,
                         snprintf(buf, len, NIPQUAD_FMT,
                                  NIPQUAD(sin6->sin6_addr.s6_addr32[3]));
                 else
-                        snprintf(buf, len, NIP6_FMT, NIP6(sin6->sin6_addr));
+                        snprintf(buf, len, "%p6", &sin6->sin6_addr);
                 break;
         default:
                 snprintf(buf, len, "unsupported address family");
diff --git a/fs/nfs/super.c b/fs/nfs/super.c
index f48db679a1c6..5fe77219df78 100644
--- a/fs/nfs/super.c
+++ b/fs/nfs/super.c
@@ -468,8 +468,7 @@ static void nfs_show_mountd_options(struct seq_file *m, struct nfs_server *nfss,
         }
         case AF_INET6: {
                 struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *)sap;
-                seq_printf(m, ",mountaddr=" NIP6_FMT,
-                                NIP6(sin6->sin6_addr));
+                seq_printf(m, ",mountaddr=%p6", &sin6->sin6_addr);
                 break;
         }
         default:
diff --git a/security/selinux/avc.c b/security/selinux/avc.c
index cb30c7e350b3..c91008f438a2 100644
--- a/security/selinux/avc.c
+++ b/security/selinux/avc.c
@@ -495,7 +495,7 @@ static inline void avc_print_ipv6_addr(struct audit_buffer *ab,
                                        char *name1, char *name2)
 {
         if (!ipv6_addr_any(addr))
-                audit_log_format(ab, " %s=" NIP6_FMT, name1, NIP6(*addr));
+                audit_log_format(ab, " %s=%p6", name1, addr);
         if (port)
                 audit_log_format(ab, " %s=%d", name2, ntohs(port));
 }