aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoland Dreier <rolandd@cisco.com>2008-05-15 18:28:55 -0400
committerRoland Dreier <rolandd@cisco.com>2008-05-15 18:28:55 -0400
commitcd80ec6f81db89d109187a673470c04af4c09a63 (patch)
treeca46c8f6d51fd578e8eec366ed7f2638af0ec71a
parent7371fd11a6e2aed99895db4f100940fa5022f7fe (diff)
IB/ipath: Fix printk format for ipath_sdma_status
Commit f018c7e1 ("IB/ipath: Change ipath_devdata.ipath_sdma_status to be unsigned long") changed ipath_sdma_status to be unsigned long, but left a few debug messages that printed it out with a %016llx format, which generates the warnings drivers/infiniband/hw/ipath/ipath_sdma.c:348: warning: format '%016llx' expects type 'long long unsigned int', but argument 3 has type 'long unsigned int' drivers/infiniband/hw/ipath/ipath_sdma.c:618: warning: format '%016llx' expects type 'long long unsigned int', but argument 3 has type 'long unsigned int' Fix this by changing the format used to print out the value to %08lx (8 hex digits are now sufficient, because the highest bit used is 31). Warnings reported by Randy Dunlap <randy.dunlap@oracle.com>. Signed-off-by: Roland Dreier <rolandd@cisco.com>
-rw-r--r--drivers/infiniband/hw/ipath/ipath_sdma.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/infiniband/hw/ipath/ipath_sdma.c b/drivers/infiniband/hw/ipath/ipath_sdma.c
index 3697449c1ba4..0a8c1b8091a2 100644
--- a/drivers/infiniband/hw/ipath/ipath_sdma.c
+++ b/drivers/infiniband/hw/ipath/ipath_sdma.c
@@ -345,7 +345,7 @@ resched:
345 * state change 345 * state change
346 */ 346 */
347 if (jiffies > dd->ipath_sdma_abort_jiffies) { 347 if (jiffies > dd->ipath_sdma_abort_jiffies) {
348 ipath_dbg("looping with status 0x%016llx\n", 348 ipath_dbg("looping with status 0x%08lx\n",
349 dd->ipath_sdma_status); 349 dd->ipath_sdma_status);
350 dd->ipath_sdma_abort_jiffies = jiffies + 5 * HZ; 350 dd->ipath_sdma_abort_jiffies = jiffies + 5 * HZ;
351 } 351 }
@@ -615,7 +615,7 @@ void ipath_restart_sdma(struct ipath_devdata *dd)
615 } 615 }
616 spin_unlock_irqrestore(&dd->ipath_sdma_lock, flags); 616 spin_unlock_irqrestore(&dd->ipath_sdma_lock, flags);
617 if (!needed) { 617 if (!needed) {
618 ipath_dbg("invalid attempt to restart SDMA, status 0x%016llx\n", 618 ipath_dbg("invalid attempt to restart SDMA, status 0x%08lx\n",
619 dd->ipath_sdma_status); 619 dd->ipath_sdma_status);
620 goto bail; 620 goto bail;
621 } 621 }