diff options
| author |   Mike Marciniszyn <mike.marciniszyn@qlogic.com> | 2011-11-09 13:36:08 -0500 |
|---|---|---|
| committer |   Roland Dreier <roland@purestorage.com> | 2012-01-03 20:52:12 -0800 |
| commit | 8482d5d1bc18c17429a89ad37f8b74d5a16de239 (patch) | |
| tree | 4d2f952d8960b198234d5f7f09efac30d96ff1a2 /drivers/infiniband/hw/qib/qib_iba7220.c | |
| parent | IB/qib: Fix style issues (diff) | |
| download | linux-dev-8482d5d1bc18c17429a89ad37f8b74d5a16de239.tar.xz linux-dev-8482d5d1bc18c17429a89ad37f8b74d5a16de239.zip | |
IB/qib: Eliminate 64-bit jiffies use
The qib driver makes use of the the 64-bit jiffies API.
Code inspection reveals that that version of the API is not really
required. This patch converts to use the "normal" jiffies.
Reviewed-by: Ram Vepa <ram.vepa@qlogic.com>
Signed-off-by: Mike Marciniszyn <mike.marciniszyn@qlogic.com>
Signed-off-by: Roland Dreier <roland@purestorage.com>
Diffstat (limited to 'drivers/infiniband/hw/qib/qib_iba7220.c')
| -rw-r--r-- | drivers/infiniband/hw/qib/qib_iba7220.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/infiniband/hw/qib/qib_iba7220.c b/drivers/infiniband/hw/qib/qib_iba7220.c index 439d3c503cd5..9dd886cc633a 100644 --- a/drivers/infiniband/hw/qib/qib_iba7220.c +++ b/drivers/infiniband/hw/qib/qib_iba7220.c @@ -1051,7 +1051,7 @@ static void reenable_7220_chase(unsigned long opaque) static void handle_7220_chase(struct qib_pportdata *ppd, u64 ibcst) { u8 ibclt; - u64 tnow; + unsigned long tnow; ibclt = (u8)SYM_FIELD(ibcst, IBCStatus, LinkTrainingState); @@ -1066,9 +1066,9 @@ static void handle_7220_chase(struct qib_pportdata *ppd, u64 ibcst) case IB_7220_LT_STATE_CFGWAITRMT: case IB_7220_LT_STATE_TXREVLANES: case IB_7220_LT_STATE_CFGENH: - tnow = get_jiffies_64(); + tnow = jiffies; if (ppd->cpspec->chase_end && - time_after64(tnow, ppd->cpspec->chase_end)) { + time_after(tnow, ppd->cpspec->chase_end)) { ppd->cpspec->chase_end = 0; qib_set_ib_7220_lstate(ppd, QLOGIC_IB_IBCC_LINKCMD_DOWN, |