staging/rdma/hfi1: diag.c fix white space errors

Add or remove whitespace according to checkpatch --strict

Signed-off-by: Ira Weiny <ira.weiny@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rdma/hfi1/diag.c b/drivers/staging/rdma/hfi1/diag.c
index 9436840..a9dc5e9 100644 (file)
--- a/drivers/staging/rdma/hfi1/diag.c
+++ b/drivers/staging/rdma/hfi1/diag.c
@@ -177,27 +177,27 @@ struct hfi1_link_info {
 #define HFI1_SNOOP_IOCGETLINKSTATE \
        _IO(HFI1_SNOOP_IOC_MAGIC, HFI1_SNOOP_IOC_BASE_SEQ)
 #define HFI1_SNOOP_IOCSETLINKSTATE \
-       _IO(HFI1_SNOOP_IOC_MAGIC, HFI1_SNOOP_IOC_BASE_SEQ+1)
+       _IO(HFI1_SNOOP_IOC_MAGIC, HFI1_SNOOP_IOC_BASE_SEQ + 1)
 #define HFI1_SNOOP_IOCCLEARQUEUE \
-       _IO(HFI1_SNOOP_IOC_MAGIC, HFI1_SNOOP_IOC_BASE_SEQ+2)
+       _IO(HFI1_SNOOP_IOC_MAGIC, HFI1_SNOOP_IOC_BASE_SEQ + 2)
 #define HFI1_SNOOP_IOCCLEARFILTER \
-       _IO(HFI1_SNOOP_IOC_MAGIC, HFI1_SNOOP_IOC_BASE_SEQ+3)
+       _IO(HFI1_SNOOP_IOC_MAGIC, HFI1_SNOOP_IOC_BASE_SEQ + 3)
 #define HFI1_SNOOP_IOCSETFILTER \
-       _IO(HFI1_SNOOP_IOC_MAGIC, HFI1_SNOOP_IOC_BASE_SEQ+4)
+       _IO(HFI1_SNOOP_IOC_MAGIC, HFI1_SNOOP_IOC_BASE_SEQ + 4)
 #define HFI1_SNOOP_IOCGETVERSION \
-       _IO(HFI1_SNOOP_IOC_MAGIC, HFI1_SNOOP_IOC_BASE_SEQ+5)
+       _IO(HFI1_SNOOP_IOC_MAGIC, HFI1_SNOOP_IOC_BASE_SEQ + 5)
 #define HFI1_SNOOP_IOCSET_OPTS \
-       _IO(HFI1_SNOOP_IOC_MAGIC, HFI1_SNOOP_IOC_BASE_SEQ+6)
+       _IO(HFI1_SNOOP_IOC_MAGIC, HFI1_SNOOP_IOC_BASE_SEQ + 6)
 
 /*
  * These offsets +6/+7 could change, but these are already known and used
  * IOCTL numbers so don't change them without a good reason.
  */
 #define HFI1_SNOOP_IOCGETLINKSTATE_EXTRA \
-       _IOWR(HFI1_SNOOP_IOC_MAGIC, HFI1_SNOOP_IOC_BASE_SEQ+6, \
+       _IOWR(HFI1_SNOOP_IOC_MAGIC, HFI1_SNOOP_IOC_BASE_SEQ + 6, \
                struct hfi1_link_info)
 #define HFI1_SNOOP_IOCSETLINKSTATE_EXTRA \
-       _IOWR(HFI1_SNOOP_IOC_MAGIC, HFI1_SNOOP_IOC_BASE_SEQ+7, \
+       _IOWR(HFI1_SNOOP_IOC_MAGIC, HFI1_SNOOP_IOC_BASE_SEQ + 7, \
                struct hfi1_link_info)
 
 static int hfi1_snoop_open(struct inode *in, struct file *fp);
@@ -323,14 +323,12 @@ static void hfi1_snoop_remove(struct hfi1_devdata *dd)
 
 void hfi1_diag_remove(struct hfi1_devdata *dd)
 {
-
        hfi1_snoop_remove(dd);
        if (atomic_dec_and_test(&diagpkt_count))
                hfi1_cdev_cleanup(&diagpkt_cdev, &diagpkt_device);
        hfi1_cdev_cleanup(&dd->diag_cdev, &dd->diag_device);
 }
 
-
 /*
  * Allocated structure shared between the credit return mechanism and
  * diagpkt_send().
@@ -441,7 +439,7 @@ static ssize_t diagpkt_send(struct diag_pkt *dp)
        }
 
        if (copy_from_user(tmpbuf,
-                          (const void __user *) (unsigned long) dp->data,
+                          (const void __user *)(unsigned long)dp->data,
                           dp->len)) {
                ret = -EFAULT;
                goto bail;
@@ -619,7 +617,6 @@ static struct hfi1_devdata *hfi1_dd_from_sc_inode(struct inode *in)
 
        dd = hfi1_lookup(unit);
        return dd;
-
 }
 
 /* clear or restore send context integrity checks */
@@ -813,7 +810,6 @@ static unsigned int hfi1_snoop_poll(struct file *fp,
 
        spin_unlock_irqrestore(&dd->hfi1_snoop.snoop_lock, flags);
        return ret;
-
 }
 
 static ssize_t hfi1_snoop_write(struct file *fp, const char __user *data,
@@ -855,7 +851,7 @@ static ssize_t hfi1_snoop_write(struct file *fp, const char __user *data,
                if (copy_from_user(&byte_one, data, 1))
                        return -EINVAL;
 
-               if (copy_from_user(&byte_two, data+1, 1))
+               if (copy_from_user(&byte_two, data + 1, 1))
                        return -EINVAL;
 
                sc4 = (byte_one >> 4) & 0xf;
@@ -1329,7 +1325,6 @@ static int hfi1_filter_mad_mgmt_class(void *ibhdr, void *packet_data,
 
 static int hfi1_filter_qp_number(void *ibhdr, void *packet_data, void *value)
 {
-
        struct hfi1_ib_header *hdr;
        struct hfi1_other_headers *ohdr = NULL;
        int ret;
@@ -1412,7 +1407,6 @@ static int hfi1_filter_ib_service_level(void *ibhdr, void *packet_data,
 
 static int hfi1_filter_ib_pkey(void *ibhdr, void *packet_data, void *value)
 {
-
        u32 lnh = 0;
        struct hfi1_ib_header *hdr;
        struct hfi1_other_headers *ohdr = NULL;
@@ -1484,7 +1478,6 @@ static struct snoop_packet *allocate_snoop_packet(u32 hdr_len,
                                                  u32 data_len,
                                                  u32 md_len)
 {
-
        struct snoop_packet *packet;
 
        packet = kzalloc(sizeof(struct snoop_packet) + hdr_len + data_len
@@ -1493,7 +1486,6 @@ static struct snoop_packet *allocate_snoop_packet(u32 hdr_len,
        if (likely(packet))
                INIT_LIST_HEAD(&packet->list);
 
-
        return packet;
 }
 
@@ -1550,7 +1542,6 @@ int snoop_recv_handler(struct hfi1_packet *packet)
                    unlikely(snoop_flags & SNOOP_USE_METADATA))
                        md_len = sizeof(struct capture_md);
 
-
                s_packet = allocate_snoop_packet(header_size,
                                                 tlen - header_size,
                                                 md_len);
@@ -1877,5 +1868,4 @@ void snoop_inline_pio_send(struct hfi1_devdata *dd, struct pio_buf *pbuf,
 
 inline_pio_out:
        pio_copy(dd, pbuf, pbc, from, count);
-
 }