IB/ipath: Fix printk format warnings
ipath_driver.c:1260: warning: format '%Lx' expects type 'long long unsigned int', but argument 6 has type 'long unsigned int' ipath_driver.c:1459: warning: format '%Lx' expects type 'long long unsigned int', but argument 4 has type 'u64' ipath_intr.c:358: warning: format '%Lx' expects type 'long long unsigned int', but argument 3 has type 'u64' ipath_intr.c:358: warning: format '%Lu' expects type 'long long unsigned int', but argument 6 has type 'u64' ipath_intr.c:1119: warning: format '%Lx' expects type 'long long unsigned int', but argument 5 has type 'u64' ipath_intr.c:1119: warning: format '%Lx' expects type 'long long unsigned int', but argument 3 has type 'u64' ipath_intr.c:1123: warning: format '%Lx' expects type 'long long unsigned int', but argument 3 has type 'u64' ipath_intr.c:1130: warning: format '%Lx' expects type 'long long unsigned int', but argument 4 has type 'u64' ipath_iba7220.c:1032: warning: format '%llx' expects type 'long long unsigned int', but argument 4 has type 'u64' ipath_iba7220.c:1045: warning: format '%llX' expects type 'long long unsigned int', but argument 3 has type 'u64' ipath_iba7220.c:2506: warning: format '%Lu' expects type 'long long unsigned int', but argument 4 has type 'u64' Signed-off-by: Alexander Beregalov <a.beregalov@gmail.com> Cc: Sean Hefty <sean.hefty@intel.com> Cc: Hal Rosenstock <hal.rosenstock@gmail.com> Signed-off-by: Roland Dreier <rolandd@cisco.com>
This commit is contained in:
parent
52fd8ca6ad
commit
70117b9e86
3 changed files with 15 additions and 9 deletions
|
@ -1259,7 +1259,7 @@ reloop:
|
||||||
*/
|
*/
|
||||||
ipath_cdbg(ERRPKT, "Error Pkt, but no eflags! egrbuf"
|
ipath_cdbg(ERRPKT, "Error Pkt, but no eflags! egrbuf"
|
||||||
" %x, len %x hdrq+%x rhf: %Lx\n",
|
" %x, len %x hdrq+%x rhf: %Lx\n",
|
||||||
etail, tlen, l,
|
etail, tlen, l, (unsigned long long)
|
||||||
le64_to_cpu(*(__le64 *) rhf_addr));
|
le64_to_cpu(*(__le64 *) rhf_addr));
|
||||||
if (ipath_debug & __IPATH_ERRPKTDBG) {
|
if (ipath_debug & __IPATH_ERRPKTDBG) {
|
||||||
u32 j, *d, dw = rsize-2;
|
u32 j, *d, dw = rsize-2;
|
||||||
|
@ -1457,7 +1457,8 @@ static void ipath_reset_availshadow(struct ipath_devdata *dd)
|
||||||
0xaaaaaaaaaaaaaaaaULL); /* All BUSY bits in qword */
|
0xaaaaaaaaaaaaaaaaULL); /* All BUSY bits in qword */
|
||||||
if (oldval != dd->ipath_pioavailshadow[i])
|
if (oldval != dd->ipath_pioavailshadow[i])
|
||||||
ipath_dbg("shadow[%d] was %Lx, now %lx\n",
|
ipath_dbg("shadow[%d] was %Lx, now %lx\n",
|
||||||
i, oldval, dd->ipath_pioavailshadow[i]);
|
i, (unsigned long long) oldval,
|
||||||
|
dd->ipath_pioavailshadow[i]);
|
||||||
}
|
}
|
||||||
spin_unlock_irqrestore(&ipath_pioavail_lock, flags);
|
spin_unlock_irqrestore(&ipath_pioavail_lock, flags);
|
||||||
}
|
}
|
||||||
|
|
|
@ -1032,7 +1032,7 @@ static int ipath_7220_bringup_serdes(struct ipath_devdata *dd)
|
||||||
ipath_cdbg(VERBOSE, "done: xgxs=%llx from %llx\n",
|
ipath_cdbg(VERBOSE, "done: xgxs=%llx from %llx\n",
|
||||||
(unsigned long long)
|
(unsigned long long)
|
||||||
ipath_read_kreg64(dd, dd->ipath_kregs->kr_xgxsconfig),
|
ipath_read_kreg64(dd, dd->ipath_kregs->kr_xgxsconfig),
|
||||||
prev_val);
|
(unsigned long long) prev_val);
|
||||||
|
|
||||||
guid = be64_to_cpu(dd->ipath_guid);
|
guid = be64_to_cpu(dd->ipath_guid);
|
||||||
|
|
||||||
|
@ -1042,7 +1042,8 @@ static int ipath_7220_bringup_serdes(struct ipath_devdata *dd)
|
||||||
ipath_dbg("No GUID for heartbeat, faking %llx\n",
|
ipath_dbg("No GUID for heartbeat, faking %llx\n",
|
||||||
(unsigned long long)guid);
|
(unsigned long long)guid);
|
||||||
} else
|
} else
|
||||||
ipath_cdbg(VERBOSE, "Wrote %llX to HRTBT_GUID\n", guid);
|
ipath_cdbg(VERBOSE, "Wrote %llX to HRTBT_GUID\n",
|
||||||
|
(unsigned long long) guid);
|
||||||
ipath_write_kreg(dd, dd->ipath_kregs->kr_hrtbt_guid, guid);
|
ipath_write_kreg(dd, dd->ipath_kregs->kr_hrtbt_guid, guid);
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
@ -2505,7 +2506,7 @@ done:
|
||||||
if (dd->ipath_flags & IPATH_IB_AUTONEG_INPROG) {
|
if (dd->ipath_flags & IPATH_IB_AUTONEG_INPROG) {
|
||||||
ipath_dbg("Did not get to DDR INIT (%x) after %Lu msecs\n",
|
ipath_dbg("Did not get to DDR INIT (%x) after %Lu msecs\n",
|
||||||
ipath_ib_state(dd, dd->ipath_lastibcstat),
|
ipath_ib_state(dd, dd->ipath_lastibcstat),
|
||||||
jiffies_to_msecs(jiffies)-startms);
|
(unsigned long long) jiffies_to_msecs(jiffies)-startms);
|
||||||
dd->ipath_flags &= ~IPATH_IB_AUTONEG_INPROG;
|
dd->ipath_flags &= ~IPATH_IB_AUTONEG_INPROG;
|
||||||
if (dd->ipath_autoneg_tries == IPATH_AUTONEG_TRIES) {
|
if (dd->ipath_autoneg_tries == IPATH_AUTONEG_TRIES) {
|
||||||
dd->ipath_flags |= IPATH_IB_AUTONEG_FAILED;
|
dd->ipath_flags |= IPATH_IB_AUTONEG_FAILED;
|
||||||
|
|
|
@ -356,9 +356,10 @@ static void handle_e_ibstatuschanged(struct ipath_devdata *dd,
|
||||||
dd->ipath_cregs->cr_iblinkerrrecovcnt);
|
dd->ipath_cregs->cr_iblinkerrrecovcnt);
|
||||||
if (linkrecov != dd->ipath_lastlinkrecov) {
|
if (linkrecov != dd->ipath_lastlinkrecov) {
|
||||||
ipath_dbg("IB linkrecov up %Lx (%s %s) recov %Lu\n",
|
ipath_dbg("IB linkrecov up %Lx (%s %s) recov %Lu\n",
|
||||||
ibcs, ib_linkstate(dd, ibcs),
|
(unsigned long long) ibcs,
|
||||||
|
ib_linkstate(dd, ibcs),
|
||||||
ipath_ibcstatus_str[ltstate],
|
ipath_ibcstatus_str[ltstate],
|
||||||
linkrecov);
|
(unsigned long long) linkrecov);
|
||||||
/* and no more until active again */
|
/* and no more until active again */
|
||||||
dd->ipath_lastlinkrecov = 0;
|
dd->ipath_lastlinkrecov = 0;
|
||||||
ipath_set_linkstate(dd, IPATH_IB_LINKDOWN);
|
ipath_set_linkstate(dd, IPATH_IB_LINKDOWN);
|
||||||
|
@ -1118,9 +1119,11 @@ irqreturn_t ipath_intr(int irq, void *data)
|
||||||
if (unlikely(istat & ~dd->ipath_i_bitsextant))
|
if (unlikely(istat & ~dd->ipath_i_bitsextant))
|
||||||
ipath_dev_err(dd,
|
ipath_dev_err(dd,
|
||||||
"interrupt with unknown interrupts %Lx set\n",
|
"interrupt with unknown interrupts %Lx set\n",
|
||||||
|
(unsigned long long)
|
||||||
istat & ~dd->ipath_i_bitsextant);
|
istat & ~dd->ipath_i_bitsextant);
|
||||||
else if (istat & ~INFINIPATH_I_ERROR) /* errors do own printing */
|
else if (istat & ~INFINIPATH_I_ERROR) /* errors do own printing */
|
||||||
ipath_cdbg(VERBOSE, "intr stat=0x%Lx\n", istat);
|
ipath_cdbg(VERBOSE, "intr stat=0x%Lx\n",
|
||||||
|
(unsigned long long) istat);
|
||||||
|
|
||||||
if (istat & INFINIPATH_I_ERROR) {
|
if (istat & INFINIPATH_I_ERROR) {
|
||||||
ipath_stats.sps_errints++;
|
ipath_stats.sps_errints++;
|
||||||
|
@ -1128,7 +1131,8 @@ irqreturn_t ipath_intr(int irq, void *data)
|
||||||
dd->ipath_kregs->kr_errorstatus);
|
dd->ipath_kregs->kr_errorstatus);
|
||||||
if (!estat)
|
if (!estat)
|
||||||
dev_info(&dd->pcidev->dev, "error interrupt (%Lx), "
|
dev_info(&dd->pcidev->dev, "error interrupt (%Lx), "
|
||||||
"but no error bits set!\n", istat);
|
"but no error bits set!\n",
|
||||||
|
(unsigned long long) istat);
|
||||||
else if (estat == -1LL)
|
else if (estat == -1LL)
|
||||||
/*
|
/*
|
||||||
* should we try clearing all, or hope next read
|
* should we try clearing all, or hope next read
|
||||||
|
|
Reference in a new issue