summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2016-10-17 16:30:57 +0200
committerDavid S. Miller <davem@davemloft.net>2016-10-17 19:07:52 +0200
commitea939008c2d7cade2cbedea5dcbd689e4415f3ed (patch)
treeaf24c8d60bb7d6a49627f6a00dc6edecd290b118 /drivers
parentMerge branch 'mv88e6xxx-interrupt-support' (diff)
downloadlinux-ea939008c2d7cade2cbedea5dcbd689e4415f3ed.tar.xz
linux-ea939008c2d7cade2cbedea5dcbd689e4415f3ed.zip
fjes: fix format string for trace output
phys_addr_t may be wider than a pointer and has to be printed using the special %pap format string, as pointed out by this new warning. arch/x86/include/../../../drivers/net/fjes/fjes_trace.h: In function ‘trace_raw_output_fjes_hw_start_debug_req’: arch/x86/include/../../../drivers/net/fjes/fjes_trace.h:212:563: error: cast to pointer from integer of different size [-Werror=int-to-pointer-cast] Note that this has to pass the address by reference instead of casting it to a different type. Fixes: b6ba737d0b29 ("fjes: ethtool -w and -W support for fjes driver") Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/fjes/fjes_trace.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/fjes/fjes_trace.h b/drivers/net/fjes/fjes_trace.h
index 22e8f1a4f9ee..cca01a1b3d64 100644
--- a/drivers/net/fjes/fjes_trace.h
+++ b/drivers/net/fjes/fjes_trace.h
@@ -222,8 +222,8 @@ TRACE_EVENT(fjes_hw_start_debug_req,
__entry->mode = req_buf->start_trace.mode;
__entry->buffer = req_buf->start_trace.buffer[0];
),
- TP_printk("req_buf=[length=%d, mode=%d, buffer=%p]",
- __entry->length, __entry->mode, (void *)__entry->buffer)
+ TP_printk("req_buf=[length=%d, mode=%d, buffer=%pap]",
+ __entry->length, __entry->mode, &__entry->buffer)
);
TRACE_EVENT(fjes_hw_start_debug,