Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9ab4295d authored by Ralph Campbell's avatar Ralph Campbell Committed by Roland Dreier
Browse files

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: default avatarRalph Campbell <ralph.campbell@qlogic.com>
Signed-off-by: default avatarRoland Dreier <rolandd@cisco.com>
parent 457fe7b8

drivers/infiniband/hw/ipath/ipath_intr.c

+0 −26
Original line number Diff line number Diff line
@@ -920,29 +920,6 @@ static noinline void ipath_bad_regread(struct ipath_devdata *dd) 
	}

}



static void handle_port_pioavail(struct ipath_devdata *dd)

{

	u32 i;

	/*

	 * start from port 1, since for now port 0  is never using

	 * wait_event for PIO

	 */

	for (i = 1; dd->ipath_portpiowait && i < dd->ipath_cfgports; i++) {

		struct ipath_portdata *pd = dd->ipath_pd[i];



		if (pd && pd->port_cnt &&

		    dd->ipath_portpiowait & (1U << i)) {

			clear_bit(i, &dd->ipath_portpiowait);

			if (test_bit(IPATH_PORT_WAITING_PIO,

				     &pd->port_flag)) {

				clear_bit(IPATH_PORT_WAITING_PIO,

					  &pd->port_flag);

				wake_up_interruptible(&pd->port_wait);

			}

		}

	}

}



static void handle_layer_pioavail(struct ipath_devdata *dd)

{

	int ret;
@@ -1195,9 +1172,6 @@ irqreturn_t ipath_intr(int irq, void *data) 
		ipath_write_kreg(dd, dd->ipath_kregs->kr_sendctrl,

				 dd->ipath_sendctrl);



		if (dd->ipath_portpiowait)

			handle_port_pioavail(dd);



		handle_layer_pioavail(dd);

	}

drivers/infiniband/hw/ipath/ipath_kernel.h

+0 −4
Original line number Diff line number Diff line
@@ -457,8 +457,6 @@ struct ipath_devdata { 
	unsigned long ipath_rcvctrl;

	/* shadow kr_sendctrl */

	unsigned long ipath_sendctrl;

	/* ports waiting for PIOavail intr */

	unsigned long ipath_portpiowait;

	unsigned long ipath_lastcancel; /* to not count armlaunch after cancel */



	/* value we put in kr_rcvhdrcnt */
@@ -759,8 +757,6 @@ int ipath_set_rx_pol_inv(struct ipath_devdata *dd, u8 new_pol_inv); 
/* portdata flag bit offsets */

		/* waiting for a packet to arrive */

#define IPATH_PORT_WAITING_RCV   2

		/* waiting for a PIO buffer to be available */

#define IPATH_PORT_WAITING_PIO   3

		/* master has not finished initializing */

#define IPATH_PORT_MASTER_UNINIT 4

		/* waiting for an urgent packet to arrive */