aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/infiniband/hw/ipath/ipath_init_chip.c
diff options
context:
space:
mode:
authorRalph Campbell <ralph.campbell@qlogic.com>2008-04-17 00:09:29 -0400
committerRoland Dreier <rolandd@cisco.com>2008-04-17 00:09:29 -0400
commit2ba3f56eb402672ff83601b5990b219d39577636 (patch)
treee2cf827ad8f4eae85d1b9f688d2617cf580dae2b /drivers/infiniband/hw/ipath/ipath_init_chip.c
parentafd9970f957454782795b23c89fd6d7dde973cc0 (diff)
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: Ralph Campbell <ralph.campbell@qlogic.com> Signed-off-by: Roland Dreier <rolandd@cisco.com>
Diffstat (limited to 'drivers/infiniband/hw/ipath/ipath_init_chip.c')
-rw-r--r--drivers/infiniband/hw/ipath/ipath_init_chip.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/infiniband/hw/ipath/ipath_init_chip.c b/drivers/infiniband/hw/ipath/ipath_init_chip.c
index 786a5e017fdd..94f938f5d5c3 100644
--- a/drivers/infiniband/hw/ipath/ipath_init_chip.c
+++ b/drivers/infiniband/hw/ipath/ipath_init_chip.c
@@ -645,7 +645,6 @@ done:
645 return ret; 645 return ret;
646} 646}
647 647
648
649/** 648/**
650 * ipath_init_chip - do the actual initialization sequence on the chip 649 * ipath_init_chip - do the actual initialization sequence on the chip
651 * @dd: the infinipath device 650 * @dd: the infinipath device
@@ -754,7 +753,7 @@ int ipath_init_chip(struct ipath_devdata *dd, int reinit)
754 753
755 dd->ipath_f_early_init(dd); 754 dd->ipath_f_early_init(dd);
756 /* 755 /*
757 * cancel any possible active sends from early driver load. 756 * Cancel any possible active sends from early driver load.
758 * Follows early_init because some chips have to initialize 757 * Follows early_init because some chips have to initialize
759 * PIO buffers in early_init to avoid false parity errors. 758 * PIO buffers in early_init to avoid false parity errors.
760 */ 759 */
@@ -884,7 +883,7 @@ int ipath_init_chip(struct ipath_devdata *dd, int reinit)
884 &dd->pcidev->dev, pd->port_rcvhdrq_size, 883 &dd->pcidev->dev, pd->port_rcvhdrq_size,
885 &dd->ipath_dummy_hdrq_phys, 884 &dd->ipath_dummy_hdrq_phys,
886 gfp_flags); 885 gfp_flags);
887 if (!dd->ipath_dummy_hdrq ) { 886 if (!dd->ipath_dummy_hdrq) {
888 dev_info(&dd->pcidev->dev, 887 dev_info(&dd->pcidev->dev,
889 "Couldn't allocate 0x%lx bytes for dummy hdrq\n", 888 "Couldn't allocate 0x%lx bytes for dummy hdrq\n",
890 pd->port_rcvhdrq_size); 889 pd->port_rcvhdrq_size);
@@ -899,7 +898,7 @@ int ipath_init_chip(struct ipath_devdata *dd, int reinit)
899 */ 898 */
900 ipath_write_kreg(dd, dd->ipath_kregs->kr_intclear, 0ULL); 899 ipath_write_kreg(dd, dd->ipath_kregs->kr_intclear, 0ULL);
901 900
902 if(!dd->ipath_stats_timer_active) { 901 if (!dd->ipath_stats_timer_active) {
903 /* 902 /*
904 * first init, or after an admin disable/enable 903 * first init, or after an admin disable/enable
905 * set up stats retrieval timer, even if we had errors 904 * set up stats retrieval timer, even if we had errors