aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/infiniband
diff options
context:
space:
mode:
authorLucas De Marchi <lucas.demarchi@profusion.mobi>2011-03-30 21:57:33 -0400
committerLucas De Marchi <lucas.demarchi@profusion.mobi>2011-03-31 10:26:23 -0400
commit25985edcedea6396277003854657b5f3cb31a628 (patch)
treef026e810210a2ee7290caeb737c23cb6472b7c38 /drivers/infiniband
parent6aba74f2791287ec407e0f92487a725a25908067 (diff)
Fix common misspellings
Fixes generated by 'codespell' and manually reviewed. Signed-off-by: Lucas De Marchi <lucas.demarchi@profusion.mobi>
Diffstat (limited to 'drivers/infiniband')
-rw-r--r--drivers/infiniband/hw/amso1100/c2_ae.c2
-rw-r--r--drivers/infiniband/hw/amso1100/c2_qp.c2
-rw-r--r--drivers/infiniband/hw/amso1100/c2_wr.h4
-rw-r--r--drivers/infiniband/hw/ipath/ipath_driver.c2
-rw-r--r--drivers/infiniband/hw/ipath/ipath_file_ops.c2
-rw-r--r--drivers/infiniband/hw/ipath/ipath_init_chip.c2
-rw-r--r--drivers/infiniband/hw/ipath/ipath_ud.c4
-rw-r--r--drivers/infiniband/hw/ipath/ipath_user_sdma.c2
-rw-r--r--drivers/infiniband/hw/nes/nes_cm.c2
-rw-r--r--drivers/infiniband/hw/nes/nes_hw.c4
-rw-r--r--drivers/infiniband/hw/nes/nes_nic.c2
-rw-r--r--drivers/infiniband/hw/qib/qib.h2
-rw-r--r--drivers/infiniband/hw/qib/qib_file_ops.c4
-rw-r--r--drivers/infiniband/hw/qib/qib_iba6120.c4
-rw-r--r--drivers/infiniband/hw/qib/qib_iba7220.c6
-rw-r--r--drivers/infiniband/hw/qib/qib_iba7322.c8
-rw-r--r--drivers/infiniband/hw/qib/qib_init.c2
-rw-r--r--drivers/infiniband/hw/qib/qib_mad.h2
-rw-r--r--drivers/infiniband/hw/qib/qib_twsi.c2
-rw-r--r--drivers/infiniband/hw/qib/qib_ud.c4
-rw-r--r--drivers/infiniband/hw/qib/qib_user_sdma.c2
-rw-r--r--drivers/infiniband/ulp/iser/iscsi_iser.h2
22 files changed, 33 insertions, 33 deletions
diff --git a/drivers/infiniband/hw/amso1100/c2_ae.c b/drivers/infiniband/hw/amso1100/c2_ae.c
index 62af74295dbe..24f9e3a90e8e 100644
--- a/drivers/infiniband/hw/amso1100/c2_ae.c
+++ b/drivers/infiniband/hw/amso1100/c2_ae.c
@@ -157,7 +157,7 @@ void c2_ae_event(struct c2_dev *c2dev, u32 mq_index)
157 int status; 157 int status;
158 158
159 /* 159 /*
160 * retreive the message 160 * retrieve the message
161 */ 161 */
162 wr = c2_mq_consume(mq); 162 wr = c2_mq_consume(mq);
163 if (!wr) 163 if (!wr)
diff --git a/drivers/infiniband/hw/amso1100/c2_qp.c b/drivers/infiniband/hw/amso1100/c2_qp.c
index d8f4bb8bf42e..0d7b6f23caff 100644
--- a/drivers/infiniband/hw/amso1100/c2_qp.c
+++ b/drivers/infiniband/hw/amso1100/c2_qp.c
@@ -612,7 +612,7 @@ void c2_free_qp(struct c2_dev *c2dev, struct c2_qp *qp)
612 c2_unlock_cqs(send_cq, recv_cq); 612 c2_unlock_cqs(send_cq, recv_cq);
613 613
614 /* 614 /*
615 * Destory qp in the rnic... 615 * Destroy qp in the rnic...
616 */ 616 */
617 destroy_qp(c2dev, qp); 617 destroy_qp(c2dev, qp);
618 618
diff --git a/drivers/infiniband/hw/amso1100/c2_wr.h b/drivers/infiniband/hw/amso1100/c2_wr.h
index c65fbdd6e469..8d4b4ca463ca 100644
--- a/drivers/infiniband/hw/amso1100/c2_wr.h
+++ b/drivers/infiniband/hw/amso1100/c2_wr.h
@@ -131,7 +131,7 @@ enum c2wr_ids {
131 * All the preceding IDs are fixed, and must not change. 131 * All the preceding IDs are fixed, and must not change.
132 * You can add new IDs, but must not remove or reorder 132 * You can add new IDs, but must not remove or reorder
133 * any IDs. If you do, YOU will ruin any hope of 133 * any IDs. If you do, YOU will ruin any hope of
134 * compatability between versions. 134 * compatibility between versions.
135 */ 135 */
136 CCWR_LAST, 136 CCWR_LAST,
137 137
@@ -242,7 +242,7 @@ enum c2_acf {
242/* 242/*
243 * to fix bug 1815 we define the max size allowable of the 243 * to fix bug 1815 we define the max size allowable of the
244 * terminate message (per the IETF spec).Refer to the IETF 244 * terminate message (per the IETF spec).Refer to the IETF
245 * protocal specification, section 12.1.6, page 64) 245 * protocol specification, section 12.1.6, page 64)
246 * The message is prefixed by 20 types of DDP info. 246 * The message is prefixed by 20 types of DDP info.
247 * 247 *
248 * Then the message has 6 bytes for the terminate control 248 * Then the message has 6 bytes for the terminate control
diff --git a/drivers/infiniband/hw/ipath/ipath_driver.c b/drivers/infiniband/hw/ipath/ipath_driver.c
index 47db4bf34628..58c0e417bc30 100644
--- a/drivers/infiniband/hw/ipath/ipath_driver.c
+++ b/drivers/infiniband/hw/ipath/ipath_driver.c
@@ -2392,7 +2392,7 @@ void ipath_shutdown_device(struct ipath_devdata *dd)
2392 /* 2392 /*
2393 * clear SerdesEnable and turn the leds off; do this here because 2393 * clear SerdesEnable and turn the leds off; do this here because
2394 * we are unloading, so don't count on interrupts to move along 2394 * we are unloading, so don't count on interrupts to move along
2395 * Turn the LEDs off explictly for the same reason. 2395 * Turn the LEDs off explicitly for the same reason.
2396 */ 2396 */
2397 dd->ipath_f_quiet_serdes(dd); 2397 dd->ipath_f_quiet_serdes(dd);
2398 2398
diff --git a/drivers/infiniband/hw/ipath/ipath_file_ops.c b/drivers/infiniband/hw/ipath/ipath_file_ops.c
index 6d4b29c4cd89..ee79a2d97b14 100644
--- a/drivers/infiniband/hw/ipath/ipath_file_ops.c
+++ b/drivers/infiniband/hw/ipath/ipath_file_ops.c
@@ -1972,7 +1972,7 @@ static int ipath_do_user_init(struct file *fp,
1972 * 0 to 1. So for those chips, we turn it off and then back on. 1972 * 0 to 1. So for those chips, we turn it off and then back on.
1973 * This will (very briefly) affect any other open ports, but the 1973 * This will (very briefly) affect any other open ports, but the
1974 * duration is very short, and therefore isn't an issue. We 1974 * duration is very short, and therefore isn't an issue. We
1975 * explictly set the in-memory tail copy to 0 beforehand, so we 1975 * explicitly set the in-memory tail copy to 0 beforehand, so we
1976 * don't have to wait to be sure the DMA update has happened 1976 * don't have to wait to be sure the DMA update has happened
1977 * (chip resets head/tail to 0 on transition to enable). 1977 * (chip resets head/tail to 0 on transition to enable).
1978 */ 1978 */
diff --git a/drivers/infiniband/hw/ipath/ipath_init_chip.c b/drivers/infiniband/hw/ipath/ipath_init_chip.c
index fef0f4201257..7c1eebe8c7c9 100644
--- a/drivers/infiniband/hw/ipath/ipath_init_chip.c
+++ b/drivers/infiniband/hw/ipath/ipath_init_chip.c
@@ -335,7 +335,7 @@ done:
335 * @dd: the infinipath device 335 * @dd: the infinipath device
336 * 336 *
337 * sanity check at least some of the values after reset, and 337 * sanity check at least some of the values after reset, and
338 * ensure no receive or transmit (explictly, in case reset 338 * ensure no receive or transmit (explicitly, in case reset
339 * failed 339 * failed
340 */ 340 */
341static int init_chip_reset(struct ipath_devdata *dd) 341static int init_chip_reset(struct ipath_devdata *dd)
diff --git a/drivers/infiniband/hw/ipath/ipath_ud.c b/drivers/infiniband/hw/ipath/ipath_ud.c
index 7420715256a9..e8a2a915251e 100644
--- a/drivers/infiniband/hw/ipath/ipath_ud.c
+++ b/drivers/infiniband/hw/ipath/ipath_ud.c
@@ -86,7 +86,7 @@ static void ipath_ud_loopback(struct ipath_qp *sqp, struct ipath_swqe *swqe)
86 } 86 }
87 87
88 /* 88 /*
89 * A GRH is expected to preceed the data even if not 89 * A GRH is expected to precede the data even if not
90 * present on the wire. 90 * present on the wire.
91 */ 91 */
92 length = swqe->length; 92 length = swqe->length;
@@ -515,7 +515,7 @@ void ipath_ud_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr,
515 } 515 }
516 516
517 /* 517 /*
518 * A GRH is expected to preceed the data even if not 518 * A GRH is expected to precede the data even if not
519 * present on the wire. 519 * present on the wire.
520 */ 520 */
521 wc.byte_len = tlen + sizeof(struct ib_grh); 521 wc.byte_len = tlen + sizeof(struct ib_grh);
diff --git a/drivers/infiniband/hw/ipath/ipath_user_sdma.c b/drivers/infiniband/hw/ipath/ipath_user_sdma.c
index be78f6643c06..f5cb13b21445 100644
--- a/drivers/infiniband/hw/ipath/ipath_user_sdma.c
+++ b/drivers/infiniband/hw/ipath/ipath_user_sdma.c
@@ -236,7 +236,7 @@ static int ipath_user_sdma_num_pages(const struct iovec *iov)
236 return 1 + ((epage - spage) >> PAGE_SHIFT); 236 return 1 + ((epage - spage) >> PAGE_SHIFT);
237} 237}
238 238
239/* truncate length to page boundry */ 239/* truncate length to page boundary */
240static int ipath_user_sdma_page_length(unsigned long addr, unsigned long len) 240static int ipath_user_sdma_page_length(unsigned long addr, unsigned long len)
241{ 241{
242 const unsigned long offset = addr & ~PAGE_MASK; 242 const unsigned long offset = addr & ~PAGE_MASK;
diff --git a/drivers/infiniband/hw/nes/nes_cm.c b/drivers/infiniband/hw/nes/nes_cm.c
index cfa3a2b22232..33c7eedaba6c 100644
--- a/drivers/infiniband/hw/nes/nes_cm.c
+++ b/drivers/infiniband/hw/nes/nes_cm.c
@@ -1397,7 +1397,7 @@ static void handle_fin_pkt(struct nes_cm_node *cm_node)
1397 cleanup_retrans_entry(cm_node); 1397 cleanup_retrans_entry(cm_node);
1398 cm_node->state = NES_CM_STATE_CLOSING; 1398 cm_node->state = NES_CM_STATE_CLOSING;
1399 send_ack(cm_node, NULL); 1399 send_ack(cm_node, NULL);
1400 /* Wait for ACK as this is simultanous close.. 1400 /* Wait for ACK as this is simultaneous close..
1401 * After we receive ACK, do not send anything.. 1401 * After we receive ACK, do not send anything..
1402 * Just rm the node.. Done.. */ 1402 * Just rm the node.. Done.. */
1403 break; 1403 break;
diff --git a/drivers/infiniband/hw/nes/nes_hw.c b/drivers/infiniband/hw/nes/nes_hw.c
index 08c194861af5..10d0a5ec9add 100644
--- a/drivers/infiniband/hw/nes/nes_hw.c
+++ b/drivers/infiniband/hw/nes/nes_hw.c
@@ -80,7 +80,7 @@ static void nes_terminate_start_timer(struct nes_qp *nesqp);
80 80
81#ifdef CONFIG_INFINIBAND_NES_DEBUG 81#ifdef CONFIG_INFINIBAND_NES_DEBUG
82static unsigned char *nes_iwarp_state_str[] = { 82static unsigned char *nes_iwarp_state_str[] = {
83 "Non-Existant", 83 "Non-Existent",
84 "Idle", 84 "Idle",
85 "RTS", 85 "RTS",
86 "Closing", 86 "Closing",
@@ -91,7 +91,7 @@ static unsigned char *nes_iwarp_state_str[] = {
91}; 91};
92 92
93static unsigned char *nes_tcp_state_str[] = { 93static unsigned char *nes_tcp_state_str[] = {
94 "Non-Existant", 94 "Non-Existent",
95 "Closed", 95 "Closed",
96 "Listen", 96 "Listen",
97 "SYN Sent", 97 "SYN Sent",
diff --git a/drivers/infiniband/hw/nes/nes_nic.c b/drivers/infiniband/hw/nes/nes_nic.c
index 2c9c1933bbe3..e96b8fb5d44c 100644
--- a/drivers/infiniband/hw/nes/nes_nic.c
+++ b/drivers/infiniband/hw/nes/nes_nic.c
@@ -902,7 +902,7 @@ static void nes_netdev_set_multicast_list(struct net_device *netdev)
902 nes_write_indexed(nesdev, NES_IDX_NIC_UNICAST_ALL, nic_active); 902 nes_write_indexed(nesdev, NES_IDX_NIC_UNICAST_ALL, nic_active);
903 } 903 }
904 904
905 nes_debug(NES_DBG_NIC_RX, "Number of MC entries = %d, Promiscous = %d, All Multicast = %d.\n", 905 nes_debug(NES_DBG_NIC_RX, "Number of MC entries = %d, Promiscuous = %d, All Multicast = %d.\n",
906 mc_count, !!(netdev->flags & IFF_PROMISC), 906 mc_count, !!(netdev->flags & IFF_PROMISC),
907 !!(netdev->flags & IFF_ALLMULTI)); 907 !!(netdev->flags & IFF_ALLMULTI));
908 if (!mc_all_on) { 908 if (!mc_all_on) {
diff --git a/drivers/infiniband/hw/qib/qib.h b/drivers/infiniband/hw/qib/qib.h
index 73225eee3cc6..769a1d9da4b7 100644
--- a/drivers/infiniband/hw/qib/qib.h
+++ b/drivers/infiniband/hw/qib/qib.h
@@ -653,7 +653,7 @@ struct diag_observer_list_elt;
653 653
654/* device data struct now contains only "general per-device" info. 654/* device data struct now contains only "general per-device" info.
655 * fields related to a physical IB port are in a qib_pportdata struct, 655 * fields related to a physical IB port are in a qib_pportdata struct,
656 * described above) while fields only used by a particualr chip-type are in 656 * described above) while fields only used by a particular chip-type are in
657 * a qib_chipdata struct, whose contents are opaque to this file. 657 * a qib_chipdata struct, whose contents are opaque to this file.
658 */ 658 */
659struct qib_devdata { 659struct qib_devdata {
diff --git a/drivers/infiniband/hw/qib/qib_file_ops.c b/drivers/infiniband/hw/qib/qib_file_ops.c
index 75bfad16c114..406fca50d036 100644
--- a/drivers/infiniband/hw/qib/qib_file_ops.c
+++ b/drivers/infiniband/hw/qib/qib_file_ops.c
@@ -1539,7 +1539,7 @@ done_chk_sdma:
1539 1539
1540 /* 1540 /*
1541 * If process has NOT already set it's affinity, select and 1541 * If process has NOT already set it's affinity, select and
1542 * reserve a processor for it, as a rendevous for all 1542 * reserve a processor for it, as a rendezvous for all
1543 * users of the driver. If they don't actually later 1543 * users of the driver. If they don't actually later
1544 * set affinity to this cpu, or set it to some other cpu, 1544 * set affinity to this cpu, or set it to some other cpu,
1545 * it just means that sooner or later we don't recommend 1545 * it just means that sooner or later we don't recommend
@@ -1657,7 +1657,7 @@ static int qib_do_user_init(struct file *fp,
1657 * 0 to 1. So for those chips, we turn it off and then back on. 1657 * 0 to 1. So for those chips, we turn it off and then back on.
1658 * This will (very briefly) affect any other open ctxts, but the 1658 * This will (very briefly) affect any other open ctxts, but the
1659 * duration is very short, and therefore isn't an issue. We 1659 * duration is very short, and therefore isn't an issue. We
1660 * explictly set the in-memory tail copy to 0 beforehand, so we 1660 * explicitly set the in-memory tail copy to 0 beforehand, so we
1661 * don't have to wait to be sure the DMA update has happened 1661 * don't have to wait to be sure the DMA update has happened
1662 * (chip resets head/tail to 0 on transition to enable). 1662 * (chip resets head/tail to 0 on transition to enable).
1663 */ 1663 */
diff --git a/drivers/infiniband/hw/qib/qib_iba6120.c b/drivers/infiniband/hw/qib/qib_iba6120.c
index 774dea897e9c..7de4b7ebffc5 100644
--- a/drivers/infiniband/hw/qib/qib_iba6120.c
+++ b/drivers/infiniband/hw/qib/qib_iba6120.c
@@ -1799,7 +1799,7 @@ static int qib_6120_setup_reset(struct qib_devdata *dd)
1799 /* 1799 /*
1800 * Keep chip from being accessed until we are ready. Use 1800 * Keep chip from being accessed until we are ready. Use
1801 * writeq() directly, to allow the write even though QIB_PRESENT 1801 * writeq() directly, to allow the write even though QIB_PRESENT
1802 * isnt' set. 1802 * isn't' set.
1803 */ 1803 */
1804 dd->flags &= ~(QIB_INITTED | QIB_PRESENT); 1804 dd->flags &= ~(QIB_INITTED | QIB_PRESENT);
1805 dd->int_counter = 0; /* so we check interrupts work again */ 1805 dd->int_counter = 0; /* so we check interrupts work again */
@@ -2171,7 +2171,7 @@ static void rcvctrl_6120_mod(struct qib_pportdata *ppd, unsigned int op,
2171 * Init the context registers also; if we were 2171 * Init the context registers also; if we were
2172 * disabled, tail and head should both be zero 2172 * disabled, tail and head should both be zero
2173 * already from the enable, but since we don't 2173 * already from the enable, but since we don't
2174 * know, we have to do it explictly. 2174 * know, we have to do it explicitly.
2175 */ 2175 */
2176 val = qib_read_ureg32(dd, ur_rcvegrindextail, ctxt); 2176 val = qib_read_ureg32(dd, ur_rcvegrindextail, ctxt);
2177 qib_write_ureg(dd, ur_rcvegrindexhead, val, ctxt); 2177 qib_write_ureg(dd, ur_rcvegrindexhead, val, ctxt);
diff --git a/drivers/infiniband/hw/qib/qib_iba7220.c b/drivers/infiniband/hw/qib/qib_iba7220.c
index de799f17cb9e..74fe0360bec7 100644
--- a/drivers/infiniband/hw/qib/qib_iba7220.c
+++ b/drivers/infiniband/hw/qib/qib_iba7220.c
@@ -2111,7 +2111,7 @@ static int qib_setup_7220_reset(struct qib_devdata *dd)
2111 /* 2111 /*
2112 * Keep chip from being accessed until we are ready. Use 2112 * Keep chip from being accessed until we are ready. Use
2113 * writeq() directly, to allow the write even though QIB_PRESENT 2113 * writeq() directly, to allow the write even though QIB_PRESENT
2114 * isnt' set. 2114 * isn't' set.
2115 */ 2115 */
2116 dd->flags &= ~(QIB_INITTED | QIB_PRESENT); 2116 dd->flags &= ~(QIB_INITTED | QIB_PRESENT);
2117 dd->int_counter = 0; /* so we check interrupts work again */ 2117 dd->int_counter = 0; /* so we check interrupts work again */
@@ -2479,7 +2479,7 @@ static int qib_7220_set_ib_cfg(struct qib_pportdata *ppd, int which, u32 val)
2479 * we command the link down. As with width, only write the 2479 * we command the link down. As with width, only write the
2480 * actual register if the link is currently down, otherwise 2480 * actual register if the link is currently down, otherwise
2481 * takes effect on next link change. Since setting is being 2481 * takes effect on next link change. Since setting is being
2482 * explictly requested (via MAD or sysfs), clear autoneg 2482 * explicitly requested (via MAD or sysfs), clear autoneg
2483 * failure status if speed autoneg is enabled. 2483 * failure status if speed autoneg is enabled.
2484 */ 2484 */
2485 ppd->link_speed_enabled = val; 2485 ppd->link_speed_enabled = val;
@@ -2778,7 +2778,7 @@ static void rcvctrl_7220_mod(struct qib_pportdata *ppd, unsigned int op,
2778 * Init the context registers also; if we were 2778 * Init the context registers also; if we were
2779 * disabled, tail and head should both be zero 2779 * disabled, tail and head should both be zero
2780 * already from the enable, but since we don't 2780 * already from the enable, but since we don't
2781 * know, we have to do it explictly. 2781 * know, we have to do it explicitly.
2782 */ 2782 */
2783 val = qib_read_ureg32(dd, ur_rcvegrindextail, ctxt); 2783 val = qib_read_ureg32(dd, ur_rcvegrindextail, ctxt);
2784 qib_write_ureg(dd, ur_rcvegrindexhead, val, ctxt); 2784 qib_write_ureg(dd, ur_rcvegrindexhead, val, ctxt);
diff --git a/drivers/infiniband/hw/qib/qib_iba7322.c b/drivers/infiniband/hw/qib/qib_iba7322.c
index 4a2d21e15a70..55de3cf3441c 100644
--- a/drivers/infiniband/hw/qib/qib_iba7322.c
+++ b/drivers/infiniband/hw/qib/qib_iba7322.c
@@ -3299,7 +3299,7 @@ static int qib_do_7322_reset(struct qib_devdata *dd)
3299 /* 3299 /*
3300 * Keep chip from being accessed until we are ready. Use 3300 * Keep chip from being accessed until we are ready. Use
3301 * writeq() directly, to allow the write even though QIB_PRESENT 3301 * writeq() directly, to allow the write even though QIB_PRESENT
3302 * isnt' set. 3302 * isn't' set.
3303 */ 3303 */
3304 dd->flags &= ~(QIB_INITTED | QIB_PRESENT | QIB_BADINTR); 3304 dd->flags &= ~(QIB_INITTED | QIB_PRESENT | QIB_BADINTR);
3305 dd->flags |= QIB_DOING_RESET; 3305 dd->flags |= QIB_DOING_RESET;
@@ -3727,7 +3727,7 @@ static int qib_7322_set_ib_cfg(struct qib_pportdata *ppd, int which, u32 val)
3727 /* 3727 /*
3728 * As with width, only write the actual register if the 3728 * As with width, only write the actual register if the
3729 * link is currently down, otherwise takes effect on next 3729 * link is currently down, otherwise takes effect on next
3730 * link change. Since setting is being explictly requested 3730 * link change. Since setting is being explicitly requested
3731 * (via MAD or sysfs), clear autoneg failure status if speed 3731 * (via MAD or sysfs), clear autoneg failure status if speed
3732 * autoneg is enabled. 3732 * autoneg is enabled.
3733 */ 3733 */
@@ -4163,7 +4163,7 @@ static void rcvctrl_7322_mod(struct qib_pportdata *ppd, unsigned int op,
4163 * Init the context registers also; if we were 4163 * Init the context registers also; if we were
4164 * disabled, tail and head should both be zero 4164 * disabled, tail and head should both be zero
4165 * already from the enable, but since we don't 4165 * already from the enable, but since we don't
4166 * know, we have to do it explictly. 4166 * know, we have to do it explicitly.
4167 */ 4167 */
4168 val = qib_read_ureg32(dd, ur_rcvegrindextail, ctxt); 4168 val = qib_read_ureg32(dd, ur_rcvegrindextail, ctxt);
4169 qib_write_ureg(dd, ur_rcvegrindexhead, val, ctxt); 4169 qib_write_ureg(dd, ur_rcvegrindexhead, val, ctxt);
@@ -7483,7 +7483,7 @@ static int serdes_7322_init_new(struct qib_pportdata *ppd)
7483 /* Baseline Wander Correction Gain [13:4-0] (leave as default) */ 7483 /* Baseline Wander Correction Gain [13:4-0] (leave as default) */
7484 /* Baseline Wander Correction Gain [3:7-5] (leave as default) */ 7484 /* Baseline Wander Correction Gain [3:7-5] (leave as default) */
7485 /* Data Rate Select [5:7-6] (leave as default) */ 7485 /* Data Rate Select [5:7-6] (leave as default) */
7486 /* RX Parralel Word Width [3:10-8] (leave as default) */ 7486 /* RX Parallel Word Width [3:10-8] (leave as default) */
7487 7487
7488 /* RX REST */ 7488 /* RX REST */
7489 /* Single- or Multi-channel reset */ 7489 /* Single- or Multi-channel reset */
diff --git a/drivers/infiniband/hw/qib/qib_init.c b/drivers/infiniband/hw/qib/qib_init.c
index ffefb78b8949..a01f3fce8eb3 100644
--- a/drivers/infiniband/hw/qib/qib_init.c
+++ b/drivers/infiniband/hw/qib/qib_init.c
@@ -346,7 +346,7 @@ done:
346 * @dd: the qlogic_ib device 346 * @dd: the qlogic_ib device
347 * 347 *
348 * sanity check at least some of the values after reset, and 348 * sanity check at least some of the values after reset, and
349 * ensure no receive or transmit (explictly, in case reset 349 * ensure no receive or transmit (explicitly, in case reset
350 * failed 350 * failed
351 */ 351 */
352static int init_after_reset(struct qib_devdata *dd) 352static int init_after_reset(struct qib_devdata *dd)
diff --git a/drivers/infiniband/hw/qib/qib_mad.h b/drivers/infiniband/hw/qib/qib_mad.h
index 147aff9117d7..7840ab593bcf 100644
--- a/drivers/infiniband/hw/qib/qib_mad.h
+++ b/drivers/infiniband/hw/qib/qib_mad.h
@@ -73,7 +73,7 @@ struct ib_mad_notice_attr {
73 73
74 struct { 74 struct {
75 __be16 reserved; 75 __be16 reserved;
76 __be16 lid; /* LID where change occured */ 76 __be16 lid; /* LID where change occurred */
77 u8 reserved2; 77 u8 reserved2;
78 u8 local_changes; /* low bit - local changes */ 78 u8 local_changes; /* low bit - local changes */
79 __be32 new_cap_mask; /* new capability mask */ 79 __be32 new_cap_mask; /* new capability mask */
diff --git a/drivers/infiniband/hw/qib/qib_twsi.c b/drivers/infiniband/hw/qib/qib_twsi.c
index 6f31ca5039db..ddde72e11edb 100644
--- a/drivers/infiniband/hw/qib/qib_twsi.c
+++ b/drivers/infiniband/hw/qib/qib_twsi.c
@@ -41,7 +41,7 @@
41 * QLogic_IB "Two Wire Serial Interface" driver. 41 * QLogic_IB "Two Wire Serial Interface" driver.
42 * Originally written for a not-quite-i2c serial eeprom, which is 42 * Originally written for a not-quite-i2c serial eeprom, which is
43 * still used on some supported boards. Later boards have added a 43 * still used on some supported boards. Later boards have added a
44 * variety of other uses, most board-specific, so teh bit-boffing 44 * variety of other uses, most board-specific, so the bit-boffing
45 * part has been split off to this file, while the other parts 45 * part has been split off to this file, while the other parts
46 * have been moved to chip-specific files. 46 * have been moved to chip-specific files.
47 * 47 *
diff --git a/drivers/infiniband/hw/qib/qib_ud.c b/drivers/infiniband/hw/qib/qib_ud.c
index 4a51fd1e9cb7..828609fa4d28 100644
--- a/drivers/infiniband/hw/qib/qib_ud.c
+++ b/drivers/infiniband/hw/qib/qib_ud.c
@@ -116,7 +116,7 @@ static void qib_ud_loopback(struct qib_qp *sqp, struct qib_swqe *swqe)
116 } 116 }
117 117
118 /* 118 /*
119 * A GRH is expected to preceed the data even if not 119 * A GRH is expected to precede the data even if not
120 * present on the wire. 120 * present on the wire.
121 */ 121 */
122 length = swqe->length; 122 length = swqe->length;
@@ -520,7 +520,7 @@ void qib_ud_rcv(struct qib_ibport *ibp, struct qib_ib_header *hdr,
520 goto drop; 520 goto drop;
521 521
522 /* 522 /*
523 * A GRH is expected to preceed the data even if not 523 * A GRH is expected to precede the data even if not
524 * present on the wire. 524 * present on the wire.
525 */ 525 */
526 wc.byte_len = tlen + sizeof(struct ib_grh); 526 wc.byte_len = tlen + sizeof(struct ib_grh);
diff --git a/drivers/infiniband/hw/qib/qib_user_sdma.c b/drivers/infiniband/hw/qib/qib_user_sdma.c
index 66208bcd7c13..82442085cbe6 100644
--- a/drivers/infiniband/hw/qib/qib_user_sdma.c
+++ b/drivers/infiniband/hw/qib/qib_user_sdma.c
@@ -239,7 +239,7 @@ static int qib_user_sdma_num_pages(const struct iovec *iov)
239} 239}
240 240
241/* 241/*
242 * Truncate length to page boundry. 242 * Truncate length to page boundary.
243 */ 243 */
244static int qib_user_sdma_page_length(unsigned long addr, unsigned long len) 244static int qib_user_sdma_page_length(unsigned long addr, unsigned long len)
245{ 245{
diff --git a/drivers/infiniband/ulp/iser/iscsi_iser.h b/drivers/infiniband/ulp/iser/iscsi_iser.h
index f1df01567bb6..2f02ab0ccc1e 100644
--- a/drivers/infiniband/ulp/iser/iscsi_iser.h
+++ b/drivers/infiniband/ulp/iser/iscsi_iser.h
@@ -91,7 +91,7 @@
91#define SIZE_4K (1UL << SHIFT_4K) 91#define SIZE_4K (1UL << SHIFT_4K)
92#define MASK_4K (~(SIZE_4K-1)) 92#define MASK_4K (~(SIZE_4K-1))
93 93
94 /* support upto 512KB in one RDMA */ 94 /* support up to 512KB in one RDMA */
95#define ISCSI_ISER_SG_TABLESIZE (0x80000 >> SHIFT_4K) 95#define ISCSI_ISER_SG_TABLESIZE (0x80000 >> SHIFT_4K)
96#define ISER_DEF_CMD_PER_LUN 128 96#define ISER_DEF_CMD_PER_LUN 128
97 97