[PATCH] IB/ipath: removed redundant statements

The tail register read became redundant as the result of earlier receive
interrupt bug fixes.

Drop another unneeded register read.

And another line that got duplicated.

Signed-off-by: Dave Olson <dave.olson@qlogic.com>
Signed-off-by: Bryan O'Sullivan <bryan.osullivan@qlogic.com>
Cc: "Michael S. Tsirkin" <mst@mellanox.co.il>
Cc: Roland Dreier <rolandd@cisco.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/drivers/infiniband/hw/ipath/ipath_driver.c b/drivers/infiniband/hw/ipath/ipath_driver.c
index 66b41ecf898b734b5dd7bcb97bffd35c4c7f55f4..979ae2996be86a2beefe0062ecb81bd112315e86 100644 (file)
--- a/drivers/infiniband/hw/ipath/ipath_driver.c
+++ b/drivers/infiniband/hw/ipath/ipath_driver.c
@@ -890,9 +890,6 @@ void ipath_kreceive(struct ipath_devdata *dd)
                goto done;
 
 reloop:
-       /* read only once at start for performance */
-       hdrqtail = (u32)le64_to_cpu(*dd->ipath_hdrqtailptr);
-
        for (i = 0; l != hdrqtail; i++) {
                u32 qp;
                u8 *bthbytes;

diff --git a/drivers/infiniband/hw/ipath/ipath_ht400.c b/drivers/infiniband/hw/ipath/ipath_ht400.c
index 64e4cbdd653b10b3e64249eeb8071ff605d7b2c4..3db015da6e77813e194ca10f77ce8ddd865fe2f3 100644 (file)
--- a/drivers/infiniband/hw/ipath/ipath_ht400.c
+++ b/drivers/infiniband/hw/ipath/ipath_ht400.c
@@ -1573,7 +1573,6 @@ void ipath_init_ht400_funcs(struct ipath_devdata *dd)
        dd->ipath_f_reset = ipath_setup_ht_reset;
        dd->ipath_f_get_boardname = ipath_ht_boardname;
        dd->ipath_f_init_hwerrors = ipath_ht_init_hwerrors;
-       dd->ipath_f_init_hwerrors = ipath_ht_init_hwerrors;
        dd->ipath_f_early_init = ipath_ht_early_init;
        dd->ipath_f_handle_hwerrors = ipath_ht_handle_hwerrors;
        dd->ipath_f_quiet_serdes = ipath_ht_quiet_serdes;

diff --git a/drivers/infiniband/hw/ipath/ipath_intr.c b/drivers/infiniband/hw/ipath/ipath_intr.c
index 83b51ed89527bc9f869c2821ed34eb453d1b7dcc..f6ca59bdd16f46e5fd7e6f2cb6601ce06587c76f 100644 (file)
--- a/drivers/infiniband/hw/ipath/ipath_intr.c
+++ b/drivers/infiniband/hw/ipath/ipath_intr.c
@@ -824,7 +824,6 @@ irqreturn_t ipath_intr(int irq, void *data, struct pt_regs *regs)
                        ipath_stats.sps_fastrcvint++;
                        goto done;
                }
-               istat = ipath_read_kreg32(dd, dd->ipath_kregs->kr_intstatus);
        }
 
        istat = ipath_read_kreg32(dd, dd->ipath_kregs->kr_intstatus);