IB/ipath: Clean up some comments

Signed-off-by: Dave Olson <dave.olson@qlogic.com>
Signed-off-by: Roland Dreier <rolandd@cisco.com>

diff --git a/drivers/infiniband/hw/ipath/ipath_driver.c b/drivers/infiniband/hw/ipath/ipath_driver.c
index 7c69090f6bd68ec0e65bfaea88b7da3a31623b37..f130652cfaa325bb7618aa449630730318b40b12 100644 (file)
--- a/drivers/infiniband/hw/ipath/ipath_driver.c
+++ b/drivers/infiniband/hw/ipath/ipath_driver.c
@@ -1196,7 +1196,7 @@ reloop:
                                  be32_to_cpu(hdr->bth[0]) & 0xff);
                else {
                        /*
-                        * error packet, type of error  unknown.
+                        * error packet, type of error unknown.
                         * Probably type 3, but we don't know, so don't
                         * even try to print the opcode, etc.
                         */

diff --git a/drivers/infiniband/hw/ipath/ipath_file_ops.c b/drivers/infiniband/hw/ipath/ipath_file_ops.c
index 2a75faf1d108a32bcacdc55be0177c0ed6f48d7d..9e5714d68ee1d8486b2bc2119d36fb171d3f56b0 100644 (file)
--- a/drivers/infiniband/hw/ipath/ipath_file_ops.c
+++ b/drivers/infiniband/hw/ipath/ipath_file_ops.c
@@ -1050,11 +1050,6 @@ static int mmap_piobufs(struct vm_area_struct *vma,
 
        phys = dd->ipath_physaddr + piobufs;
 
-       /*
-        * Don't mark this as non-cached, or we don't get the
-        * write combining behavior we want on the PIO buffers!
-        */
-
 #if defined(__powerpc__)
        /* There isn't a generic way to specify writethrough mappings */
        pgprot_val(vma->vm_page_prot) |= _PAGE_NO_CACHE;

diff --git a/drivers/infiniband/hw/ipath/ipath_iba6110.c b/drivers/infiniband/hw/ipath/ipath_iba6110.c
index ce858797e29961162862e02a373db01c3da72e19..dffb6826579a2e9af96050daf7ebb12c0a4a72f7 100644 (file)
--- a/drivers/infiniband/hw/ipath/ipath_iba6110.c
+++ b/drivers/infiniband/hw/ipath/ipath_iba6110.c
@@ -1022,7 +1022,8 @@ static int ipath_setup_ht_config(struct ipath_devdata *dd,
        do {
                u8 cap_type;
 
-               /* the HT capability type byte is 3 bytes after the
+               /*
+                * The HT capability type byte is 3 bytes after the
                 * capability byte.
                 */
                if (pci_read_config_byte(pdev, pos + 3, &cap_type)) {

diff --git a/drivers/infiniband/hw/ipath/ipath_iba6120.c b/drivers/infiniband/hw/ipath/ipath_iba6120.c
index 97ae117939736ec81244dbe2d98a75333bac1846..66925b255ccd4ffe14234881e7ceb4fde6594f1d 100644 (file)
--- a/drivers/infiniband/hw/ipath/ipath_iba6120.c
+++ b/drivers/infiniband/hw/ipath/ipath_iba6120.c
@@ -535,7 +535,7 @@ static void ipath_pe_handle_hwerrors(struct ipath_devdata *dd, char *msg,
 
        if (hwerrs & INFINIPATH_HWE_SERDESPLLFAILED) {
                /*
-                * If it occurs, it is left masked since the eternal
+                * If it occurs, it is left masked since the external
                 * interface is unused
                 */
                dd->ipath_hwerrmask &= ~INFINIPATH_HWE_SERDESPLLFAILED;

diff --git a/drivers/infiniband/hw/ipath/ipath_keys.c b/drivers/infiniband/hw/ipath/ipath_keys.c
index 85a4aefc6c03cbbb94f63af4eade1f92a36f91fe..8f32b17a5eed019d304a4b3c4283019274e69170 100644 (file)
--- a/drivers/infiniband/hw/ipath/ipath_keys.c
+++ b/drivers/infiniband/hw/ipath/ipath_keys.c
@@ -128,9 +128,8 @@ int ipath_lkey_ok(struct ipath_qp *qp, struct ipath_sge *isge,
        int ret;
 
        /*
-        * We use LKEY == zero to mean a physical kmalloc() address.
-        * This is a bit of a hack since we rely on dma_map_single()
-        * being reversible by calling bus_to_virt().
+        * We use LKEY == zero for kernel virtual addresses
+        * (see ipath_get_dma_mr and ipath_dma.c).
         */
        if (sge->lkey == 0) {
                struct ipath_pd *pd = to_ipd(qp->ibqp.pd);

diff --git a/drivers/infiniband/hw/ipath/ipath_verbs.c b/drivers/infiniband/hw/ipath/ipath_verbs.c
index a2baa618daf2c53c1cbcf90084263434e8cf447e..904ff1571ba649dc7ee59f88bd039adf887f719b 100644 (file)
--- a/drivers/infiniband/hw/ipath/ipath_verbs.c
+++ b/drivers/infiniband/hw/ipath/ipath_verbs.c
@@ -943,7 +943,7 @@ bail:
  * ipath_verbs_send - send a packet
  * @qp: the QP to send on
  * @hdr: the packet header
- * @hdrwords: the number of words in the header
+ * @hdrwords: the number of 32-bit words in the header
  * @ss: the SGE to send
  * @len: the length of the packet in bytes
  */
@@ -955,7 +955,10 @@ int ipath_verbs_send(struct ipath_qp *qp, struct ipath_ib_header *hdr,
        int ret;
        u32 dwords = (len + 3) >> 2;
 
-       /* +1 is for the qword padding of pbc */
+       /*
+        * Calculate the send buffer trigger address.
+        * The +1 counts for the pbc control dword following the pbc length.
+        */
        plen = hdrwords + dwords + 1;
 
        /* Drop non-VL15 packets if we are not in the active state */