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

Commit 2ba3f56e authored by Ralph Campbell's avatar Ralph Campbell Committed by Roland Dreier
Browse files

IB/ipath: Fix some white space and code style issues 



This patch makes some white space changes and minor non-functional
changes to more closely match the code in OFED-1.3.

Signed-off-by: default avatarRalph Campbell <ralph.campbell@qlogic.com>
Signed-off-by: default avatarRoland Dreier <rolandd@cisco.com>
parent afd9970f

drivers/infiniband/hw/ipath/ipath_driver.c

+16 −13
Original line number Diff line number Diff line
@@ -627,7 +627,8 @@ static int __devinit ipath_init_one(struct pci_dev *pdev, 
	goto bail;



bail_irqsetup:

	if (pdev->irq) free_irq(pdev->irq, dd);

	if (pdev->irq)

		free_irq(pdev->irq, dd);



bail_iounmap:

	iounmap((volatile void __iomem *) dd->ipath_kregbase);
@@ -1704,7 +1705,10 @@ int ipath_create_rcvhdrq(struct ipath_devdata *dd, 
void ipath_cancel_sends(struct ipath_devdata *dd, int restore_sendctrl)

{

	ipath_dbg("Cancelling all in-progress send buffers\n");

	dd->ipath_lastcancel = jiffies+HZ/2; /* skip armlaunch errs a bit */



	/* skip armlaunch errs for a while */

	dd->ipath_lastcancel = jiffies + HZ / 2;



	/*

	 * the abort bit is auto-clearing.  We read scratch to be sure

	 * that cancels and the abort have taken effect in the chip.
@@ -2070,10 +2074,9 @@ void ipath_set_led_override(struct ipath_devdata *dd, unsigned int val) 
		dd->ipath_led_override_timer.data = (unsigned long) dd;

		dd->ipath_led_override_timer.expires = jiffies + 1;

		add_timer(&dd->ipath_led_override_timer);

	} else {

	} else

		atomic_dec(&dd->ipath_led_override_timer_active);

}

}



/**

 * ipath_shutdown_device - shut down a device
@@ -2468,9 +2471,9 @@ void ipath_hol_event(unsigned long opaque) 
int ipath_set_rx_pol_inv(struct ipath_devdata *dd, u8 new_pol_inv)

{

	u64 val;

	if ( new_pol_inv > INFINIPATH_XGXS_RX_POL_MASK ) {



	if (new_pol_inv > INFINIPATH_XGXS_RX_POL_MASK)

		return -1;

	}

	if (dd->ipath_rx_pol_inv != new_pol_inv) {

		dd->ipath_rx_pol_inv = new_pol_inv;

		val = ipath_read_kreg64(dd, dd->ipath_kregs->kr_xgxsconfig);

drivers/infiniband/hw/ipath/ipath_init_chip.c

+3 −4
Original line number Diff line number Diff line
@@ -645,7 +645,6 @@ static int init_housekeeping(struct ipath_devdata *dd, 
	return ret;

}





/**

 * ipath_init_chip - do the actual initialization sequence on the chip

 * @dd: the infinipath device
@@ -754,7 +753,7 @@ int ipath_init_chip(struct ipath_devdata *dd, int reinit) 


	dd->ipath_f_early_init(dd);

	/*

	 * cancel any possible active sends from early driver load.

	 * Cancel any possible active sends from early driver load.

	 * Follows early_init because some chips have to initialize

	 * PIO buffers in early_init to avoid false parity errors.

	 */

drivers/infiniband/hw/ipath/ipath_intr.c

+8 −8
Original line number Diff line number Diff line
@@ -590,6 +590,7 @@ static int handle_errors(struct ipath_devdata *dd, ipath_err_t errs) 
		 * ones on this particular interrupt, which also isn't great

		 */

		dd->ipath_maskederrs |= dd->ipath_lasterror | errs;



		dd->ipath_errormask &= ~dd->ipath_maskederrs;

		ipath_write_kreg(dd, dd->ipath_kregs->kr_errormask,

				 dd->ipath_errormask);
@@ -786,7 +787,6 @@ static int handle_errors(struct ipath_devdata *dd, ipath_err_t errs) 
	return chkerrpkts;

}





/*

 * try to cleanup as much as possible for anything that might have gone

 * wrong while in freeze mode, such as pio buffers being written by user
@@ -974,6 +974,7 @@ static void handle_urcv(struct ipath_devdata *dd, u32 istat) 
		   dd->ipath_i_rcvurg_mask);

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

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



		if (portr & (1 << i) && pd && pd->port_cnt) {

			if (test_and_clear_bit(IPATH_PORT_WAITING_RCV,

					       &pd->port_flag)) {
@@ -1095,8 +1096,7 @@ irqreturn_t ipath_intr(int irq, void *data) 


		gpiostatus = ipath_read_kreg32(

			dd, dd->ipath_kregs->kr_gpio_status);

		/* First the error-counter case.

		 */

		/* First the error-counter case. */

		if ((gpiostatus & IPATH_GPIO_ERRINTR_MASK) &&

		    (dd->ipath_flags & IPATH_GPIO_ERRINTRS)) {

			/* want to clear the bits we see asserted. */

drivers/infiniband/hw/ipath/ipath_stats.c

+7 −6
Original line number Diff line number Diff line
@@ -306,7 +306,8 @@ void ipath_get_faststats(unsigned long opaque) 
			 * level.

			 */

			if (iserr)

					ipath_dbg("Re-enabling queue full errors (%s)\n",

				ipath_dbg(

					"Re-enabling queue full errors (%s)\n",

					ebuf);

			else

				ipath_cdbg(ERRPKT, "Re-enabling packet"

drivers/infiniband/hw/ipath/ipath_kernel.h

+2 −2

File changed.

Contains only whitespace changes.

drivers/infiniband/hw/ipath/ipath_registers.h

+2 −2

File changed.

Contains only whitespace changes.