IB/ipath: Add ipath_read_ireg() abstraction

Different chips have different width interrupt status registers, so add
a flag and accessor function to decide which width register read to use.

Signed-off-by: Arthur Jones <arthur.jones@qlogic.com>
Signed-off-by: Roland Dreier <rolandd@cisco.com>

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/infiniband/hw/ipath/ipath_intr.c b/drivers/infiniband/hw/ipath/ipath_intr.c
index ddc0a19c5eee..92e58c921522 100644
--- a/drivers/infiniband/hw/ipath/ipath_intr.c
+++ b/drivers/infiniband/hw/ipath/ipath_intr.c
@@ -883,7 +883,7 @@ static noinline void ipath_bad_intr(struct ipath_devdata *dd, u32 *unexpectp)
                                 dd->ipath_f_free_irq(dd);
                         }
                 }
-                if (ipath_read_kreg32(dd, dd->ipath_kregs->kr_intmask)) {
+                if (ipath_read_ireg(dd, dd->ipath_kregs->kr_intmask)) {
                         ipath_dev_err(dd, "%u unexpected interrupts, "
                                       "disabling interrupts completely\n",
                                       *unexpectp);
@@ -1034,7 +1034,7 @@ irqreturn_t ipath_intr(int irq, void *data)
                 goto bail;
         }
 
-        istat = ipath_read_kreg32(dd, dd->ipath_kregs->kr_intstatus);
+        istat = ipath_read_ireg(dd, dd->ipath_kregs->kr_intstatus);
 
         if (unlikely(!istat)) {
                 ipath_stats.sps_nullintr++;