diff options
author | Ralph Campbell <ralph.campbell@qlogic.com> | 2007-10-12 23:48:06 -0400 |
---|---|---|
committer | Roland Dreier <rolandd@cisco.com> | 2008-01-25 17:15:27 -0500 |
commit | 9ab4295d1d9ab10a249aea002060685f935a528c (patch) | |
tree | 66950ae4a032120b0b22988c89fc7d699df420af /drivers/infiniband | |
parent | 457fe7b8a6822907cbe65897dc81b83d9df5bcbf (diff) |
IB/ipath: Remove dead code for user process waiting for send buffer
At one point in time there was code to allow a user process to
wait for a send buffer if none were available. This feature was
never used and most of the code was removed. This removes
some missed unused code.
Signed-off-by: Ralph Campbell <ralph.campbell@qlogic.com>
Signed-off-by: Roland Dreier <rolandd@cisco.com>
Diffstat (limited to 'drivers/infiniband')
-rw-r--r-- | drivers/infiniband/hw/ipath/ipath_intr.c | 26 | ||||
-rw-r--r-- | drivers/infiniband/hw/ipath/ipath_kernel.h | 4 |
2 files changed, 0 insertions, 30 deletions
diff --git a/drivers/infiniband/hw/ipath/ipath_intr.c b/drivers/infiniband/hw/ipath/ipath_intr.c index 8f3718c1694f..ad41cccd2e9f 100644 --- a/drivers/infiniband/hw/ipath/ipath_intr.c +++ b/drivers/infiniband/hw/ipath/ipath_intr.c | |||
@@ -920,29 +920,6 @@ static noinline void ipath_bad_regread(struct ipath_devdata *dd) | |||
920 | } | 920 | } |
921 | } | 921 | } |
922 | 922 | ||
923 | static void handle_port_pioavail(struct ipath_devdata *dd) | ||
924 | { | ||
925 | u32 i; | ||
926 | /* | ||
927 | * start from port 1, since for now port 0 is never using | ||
928 | * wait_event for PIO | ||
929 | */ | ||
930 | for (i = 1; dd->ipath_portpiowait && i < dd->ipath_cfgports; i++) { | ||
931 | struct ipath_portdata *pd = dd->ipath_pd[i]; | ||
932 | |||
933 | if (pd && pd->port_cnt && | ||
934 | dd->ipath_portpiowait & (1U << i)) { | ||
935 | clear_bit(i, &dd->ipath_portpiowait); | ||
936 | if (test_bit(IPATH_PORT_WAITING_PIO, | ||
937 | &pd->port_flag)) { | ||
938 | clear_bit(IPATH_PORT_WAITING_PIO, | ||
939 | &pd->port_flag); | ||
940 | wake_up_interruptible(&pd->port_wait); | ||
941 | } | ||
942 | } | ||
943 | } | ||
944 | } | ||
945 | |||
946 | static void handle_layer_pioavail(struct ipath_devdata *dd) | 923 | static void handle_layer_pioavail(struct ipath_devdata *dd) |
947 | { | 924 | { |
948 | int ret; | 925 | int ret; |
@@ -1195,9 +1172,6 @@ irqreturn_t ipath_intr(int irq, void *data) | |||
1195 | ipath_write_kreg(dd, dd->ipath_kregs->kr_sendctrl, | 1172 | ipath_write_kreg(dd, dd->ipath_kregs->kr_sendctrl, |
1196 | dd->ipath_sendctrl); | 1173 | dd->ipath_sendctrl); |
1197 | 1174 | ||
1198 | if (dd->ipath_portpiowait) | ||
1199 | handle_port_pioavail(dd); | ||
1200 | |||
1201 | handle_layer_pioavail(dd); | 1175 | handle_layer_pioavail(dd); |
1202 | } | 1176 | } |
1203 | 1177 | ||
diff --git a/drivers/infiniband/hw/ipath/ipath_kernel.h b/drivers/infiniband/hw/ipath/ipath_kernel.h index 1ef82d6bf377..65f7c7f7b5d9 100644 --- a/drivers/infiniband/hw/ipath/ipath_kernel.h +++ b/drivers/infiniband/hw/ipath/ipath_kernel.h | |||
@@ -457,8 +457,6 @@ struct ipath_devdata { | |||
457 | unsigned long ipath_rcvctrl; | 457 | unsigned long ipath_rcvctrl; |
458 | /* shadow kr_sendctrl */ | 458 | /* shadow kr_sendctrl */ |
459 | unsigned long ipath_sendctrl; | 459 | unsigned long ipath_sendctrl; |
460 | /* ports waiting for PIOavail intr */ | ||
461 | unsigned long ipath_portpiowait; | ||
462 | unsigned long ipath_lastcancel; /* to not count armlaunch after cancel */ | 460 | unsigned long ipath_lastcancel; /* to not count armlaunch after cancel */ |
463 | 461 | ||
464 | /* value we put in kr_rcvhdrcnt */ | 462 | /* value we put in kr_rcvhdrcnt */ |
@@ -759,8 +757,6 @@ int ipath_set_rx_pol_inv(struct ipath_devdata *dd, u8 new_pol_inv); | |||
759 | /* portdata flag bit offsets */ | 757 | /* portdata flag bit offsets */ |
760 | /* waiting for a packet to arrive */ | 758 | /* waiting for a packet to arrive */ |
761 | #define IPATH_PORT_WAITING_RCV 2 | 759 | #define IPATH_PORT_WAITING_RCV 2 |
762 | /* waiting for a PIO buffer to be available */ | ||
763 | #define IPATH_PORT_WAITING_PIO 3 | ||
764 | /* master has not finished initializing */ | 760 | /* master has not finished initializing */ |
765 | #define IPATH_PORT_MASTER_UNINIT 4 | 761 | #define IPATH_PORT_MASTER_UNINIT 4 |
766 | /* waiting for an urgent packet to arrive */ | 762 | /* waiting for an urgent packet to arrive */ |