IB/hfi1: Fix two format strings

Enable format string checking for hfi1_cdbg() and fix the resulting
compiler warnings.

Signed-off-by: Bart Van Assche <bvanassche@acm.org>
Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>

diff --git a/drivers/infiniband/hw/hfi1/init.c b/drivers/infiniband/hw/hfi1/init.c
index faaaac8fbc553b4a63e907ab2d6747cf3a672a51..3c339617aa95ea8d4dfd7a09798b01a30ac4f7ab 100644 (file)
--- a/drivers/infiniband/hw/hfi1/init.c
+++ b/drivers/infiniband/hw/hfi1/init.c
@@ -469,7 +469,7 @@ int hfi1_create_ctxtdata(struct hfi1_pportdata *ppd, int numa,
                if (rcd->egrbufs.size < hfi1_max_mtu) {
                        rcd->egrbufs.size = __roundup_pow_of_two(hfi1_max_mtu);
                        hfi1_cdbg(PROC,
-                                 "ctxt%u: eager bufs size too small. Adjusting to %zu\n",
+                                 "ctxt%u: eager bufs size too small. Adjusting to %u\n",
                                    rcd->ctxt, rcd->egrbufs.size);
                }
                rcd->egrbufs.rcvtid_size = HFI1_MAX_EAGER_BUFFER_SIZE;
@@ -2071,7 +2071,7 @@ int hfi1_setup_eagerbufs(struct hfi1_ctxtdata *rcd)
        rcd->egrbufs.size = alloced_bytes;
 
        hfi1_cdbg(PROC,
-                 "ctxt%u: Alloced %u rcv tid entries @ %uKB, total %zuKB\n",
+                 "ctxt%u: Alloced %u rcv tid entries @ %uKB, total %uKB\n",
                  rcd->ctxt, rcd->egrbufs.alloced,
                  rcd->egrbufs.rcvtid_size / 1024, rcd->egrbufs.size / 1024);
 

diff --git a/drivers/infiniband/hw/hfi1/trace_dbg.h b/drivers/infiniband/hw/hfi1/trace_dbg.h
index e62171fb7379f7ee63960109f7b6bb580b974f21..de7a87392b8d64c1b54c590d40694c0192831b38 100644 (file)
--- a/drivers/infiniband/hw/hfi1/trace_dbg.h
+++ b/drivers/infiniband/hw/hfi1/trace_dbg.h
@@ -86,14 +86,14 @@ DECLARE_EVENT_CLASS(hfi1_trace_template,
  * actual function to work and can not be in a macro.
  */
 #define __hfi1_trace_def(lvl) \
-void __hfi1_trace_##lvl(const char *funct, char *fmt, ...);            \
+void __printf(2, 3) __hfi1_trace_##lvl(const char *funct, char *fmt, ...); \
                                                                        \
 DEFINE_EVENT(hfi1_trace_template, hfi1_ ##lvl,                         \
        TP_PROTO(const char *function, struct va_format *vaf),          \
        TP_ARGS(function, vaf))
 
 #define __hfi1_trace_fn(lvl) \
-void __hfi1_trace_##lvl(const char *func, char *fmt, ...)              \
+void __printf(2, 3) __hfi1_trace_##lvl(const char *func, char *fmt, ...)\
 {                                                                      \
        struct va_format vaf = {                                        \
                .fmt = fmt,                                             \