diff options
author | Bryan O'Sullivan <bos@pathscale.com> | 2006-07-01 07:36:08 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-01 12:56:00 -0400 |
commit | 7cd658cd2bca48d3a0e747b4525c72eb8855278e (patch) | |
tree | f12e9b533ffea61978e4aea642066f774aa16777 /drivers | |
parent | c100f622fd9e529e0f4e4324b93f66d105dde61d (diff) |
[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>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/infiniband/hw/ipath/ipath_driver.c | 3 | ||||
-rw-r--r-- | drivers/infiniband/hw/ipath/ipath_ht400.c | 1 | ||||
-rw-r--r-- | drivers/infiniband/hw/ipath/ipath_intr.c | 1 |
3 files changed, 0 insertions, 5 deletions
diff --git a/drivers/infiniband/hw/ipath/ipath_driver.c b/drivers/infiniband/hw/ipath/ipath_driver.c index 66b41ecf898b..979ae2996be8 100644 --- 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) | |||
890 | goto done; | 890 | goto done; |
891 | 891 | ||
892 | reloop: | 892 | reloop: |
893 | /* read only once at start for performance */ | ||
894 | hdrqtail = (u32)le64_to_cpu(*dd->ipath_hdrqtailptr); | ||
895 | |||
896 | for (i = 0; l != hdrqtail; i++) { | 893 | for (i = 0; l != hdrqtail; i++) { |
897 | u32 qp; | 894 | u32 qp; |
898 | u8 *bthbytes; | 895 | u8 *bthbytes; |
diff --git a/drivers/infiniband/hw/ipath/ipath_ht400.c b/drivers/infiniband/hw/ipath/ipath_ht400.c index 64e4cbdd653b..3db015da6e77 100644 --- 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) | |||
1573 | dd->ipath_f_reset = ipath_setup_ht_reset; | 1573 | dd->ipath_f_reset = ipath_setup_ht_reset; |
1574 | dd->ipath_f_get_boardname = ipath_ht_boardname; | 1574 | dd->ipath_f_get_boardname = ipath_ht_boardname; |
1575 | dd->ipath_f_init_hwerrors = ipath_ht_init_hwerrors; | 1575 | dd->ipath_f_init_hwerrors = ipath_ht_init_hwerrors; |
1576 | dd->ipath_f_init_hwerrors = ipath_ht_init_hwerrors; | ||
1577 | dd->ipath_f_early_init = ipath_ht_early_init; | 1576 | dd->ipath_f_early_init = ipath_ht_early_init; |
1578 | dd->ipath_f_handle_hwerrors = ipath_ht_handle_hwerrors; | 1577 | dd->ipath_f_handle_hwerrors = ipath_ht_handle_hwerrors; |
1579 | dd->ipath_f_quiet_serdes = ipath_ht_quiet_serdes; | 1578 | 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 83b51ed89527..f6ca59bdd16f 100644 --- 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) | |||
824 | ipath_stats.sps_fastrcvint++; | 824 | ipath_stats.sps_fastrcvint++; |
825 | goto done; | 825 | goto done; |
826 | } | 826 | } |
827 | istat = ipath_read_kreg32(dd, dd->ipath_kregs->kr_intstatus); | ||
828 | } | 827 | } |
829 | 828 | ||
830 | istat = ipath_read_kreg32(dd, dd->ipath_kregs->kr_intstatus); | 829 | istat = ipath_read_kreg32(dd, dd->ipath_kregs->kr_intstatus); |