sdp: remove white spaces in the end of some lines.

Signed-off-by: Eldad Zinger <eldadz@mellanox.co.il>

diff --git a/drivers/infiniband/ulp/sdp/sdp_bcopy.c b/drivers/infiniband/ulp/sdp/sdp_bcopy.c
index 7b5fe402c09eea3a36a81f50fc1868c2b6e9ba8d..6c7d700fa3e5e07b2d0aa2b34c43da1433167a2b 100644 (file)
--- a/drivers/infiniband/ulp/sdp/sdp_bcopy.c
+++ b/drivers/infiniband/ulp/sdp/sdp_bcopy.c
@@ -86,7 +86,7 @@ void _dump_packet(const char *func, int line, struct sock *sk, char *str,
 
                len += snprintf(buf + len, 255-len, " | payload: 0x%zx, "
                                "len: 0x%zx, rkey: 0x%x, vaddr: 0x%llx |",
-                               ntohl(h->len) - sizeof(struct sdp_bsdh) - 
+                               ntohl(h->len) - sizeof(struct sdp_bsdh) -
                                sizeof(struct sdp_srcah),
                                ntohl(srcah->len), ntohl(srcah->rkey),
                                be64_to_cpu(srcah->vaddr));
@@ -205,7 +205,7 @@ void sdp_post_sends(struct sdp_sock *ssk, gfp_t gfp)
            sdp_tx_ring_slots_left(ssk)) {
                ssk->recv_request = 0;
 
-               skb = sdp_alloc_skb_chrcvbuf_ack(sk, 
+               skb = sdp_alloc_skb_chrcvbuf_ack(sk,
                                ssk->recv_frags * PAGE_SIZE, gfp);
 
                sdp_post_send(ssk, skb);

diff --git a/drivers/infiniband/ulp/sdp/sdp_cma.c b/drivers/infiniband/ulp/sdp/sdp_cma.c
index 35532ad00c8c8aa742308287390ac7074cf05727..588803094b3dc6d68ded2cbedc6dc44234b11653 100644 (file)
--- a/drivers/infiniband/ulp/sdp/sdp_cma.c
+++ b/drivers/infiniband/ulp/sdp/sdp_cma.c
@@ -95,10 +95,10 @@ static int sdp_init_qp(struct sock *sk, struct rdma_cm_id *id)
 
        qp_init_attr.cap.max_send_sge = MIN(sdp_sk(sk)->max_sge, SDP_MAX_SEND_SGES);
        sdp_dbg(sk, "Setting max send sge to: %d\n", qp_init_attr.cap.max_send_sge);
-               
+
        qp_init_attr.cap.max_recv_sge = MIN(sdp_sk(sk)->max_sge, SDP_MAX_RECV_SGES);
        sdp_dbg(sk, "Setting max recv sge to: %d\n", qp_init_attr.cap.max_recv_sge);
-               
+
        sdp_sk(sk)->sdp_dev = ib_get_client_data(device, &sdp_client);
        if (!sdp_sk(sk)->sdp_dev) {
                sdp_warn(sk, "SDP not available on device %s\n", device->name);
@@ -344,7 +344,7 @@ int sdp_cma_handler(struct rdma_cm_id *id, struct rdma_cm_event *event)
        switch (event->event) {
        case RDMA_CM_EVENT_ADDR_RESOLVED:
                if (sdp_link_layer_ib_only &&
-                       rdma_node_get_transport(id->device->node_type) == 
+                       rdma_node_get_transport(id->device->node_type) ==
                                RDMA_TRANSPORT_IB &&
                        rdma_port_link_layer(id->device, id->port_num) !=
                                IB_LINK_LAYER_INFINIBAND) {

diff --git a/drivers/infiniband/ulp/sdp/sdp_main.c b/drivers/infiniband/ulp/sdp/sdp_main.c
index 7c8494c3deb456966dcbba3f11939a43225e335f..ee2e9f92ae4cf98e64afd6664b70640699ae7372 100644 (file)
--- a/drivers/infiniband/ulp/sdp/sdp_main.c
+++ b/drivers/infiniband/ulp/sdp/sdp_main.c
@@ -602,7 +602,7 @@ static void sdp_cma_timewait_timeout_work(struct work_struct *work)
        struct sdp_sock *ssk =
                container_of(work, struct sdp_sock, cma_timewait_work.work);
        struct sock *sk = &ssk->isk.sk;
-       
+
        lock_sock(sk);
        if (!ssk->cma_timewait_timeout) {
                release_sock(sk);
@@ -666,7 +666,7 @@ static void sdp_close(struct sock *sk, long timeout)
 
        sock_hold(sk, SOCK_REF_CMA);
        sdp_start_cma_timewait_timeout(sdp_sk(sk), SDP_CMA_TIMEWAIT_TIMEOUT);
-       
+
        /*  We need to flush the recv. buffs.  We do this only on the
         *  descriptor close, not protocol-sourced closes, because the
         *  reader process may not have drained the data yet!
@@ -1071,7 +1071,7 @@ static void sdp_dreq_wait_timeout_work(struct work_struct *work)
        struct sdp_sock *ssk =
                container_of(work, struct sdp_sock, dreq_wait_work.work);
        struct sock *sk = &ssk->isk.sk;
-       
+
        if (!ssk->dreq_wait_timeout)
                goto out;
 
@@ -1840,14 +1840,14 @@ int sdp_tx_wait_memory(struct sdp_sock *ssk, long *timeo_p, int *credits_needed)
 
                if (credits_needed) {
                        sk_wait_event(sk, &current_timeo,
-                                       !sk->sk_err && 
+                                       !sk->sk_err &&
                                        !(sk->sk_shutdown & SEND_SHUTDOWN) &&
                                        !ssk->tx_compl_pending &&
                                        tx_slots_free(ssk) >= *credits_needed &&
                                        vm_wait);
                } else {
                        sk_wait_event(sk, &current_timeo,
-                                       !sk->sk_err && 
+                                       !sk->sk_err &&
                                        !(sk->sk_shutdown & SEND_SHUTDOWN) &&
                                        !ssk->tx_compl_pending &&
                                        sk_stream_memory_free(sk) &&
@@ -1928,7 +1928,7 @@ static int sdp_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
        if (sk->sk_err || (sk->sk_shutdown & SEND_SHUTDOWN))
                goto do_error;
 
-       for (i = 0; i < msg->msg_iovlen; i++) { 
+       for (i = 0; i < msg->msg_iovlen; i++) {
                struct iovec *iov = &msg->msg_iov[i];
                int seglen = iov->iov_len;
                char __user *from = iov->iov_base;
@@ -1948,7 +1948,7 @@ static int sdp_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
                                err = zcopied;
                                goto out_err;
                        }
-                       
+
                        copied += zcopied;
                        seglen = iov->iov_len;
                        from = iov->iov_base;
@@ -2283,7 +2283,7 @@ static int sdp_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
                                break;
 
                        case SDP_MID_DATA:
-sdp_mid_data:                          
+sdp_mid_data:
                                rx_sa = NULL;
                                avail_bytes_count = skb->len;
                                break;
@@ -2481,7 +2481,7 @@ skb_cleanup:
 
                                kfree(rx_sa);
                                rx_sa = NULL;
-                               
+
                        }
 force_skb_cleanup:
                        sdp_dbg_data(sk, "unlinking skb %p\n", skb);

diff --git a/drivers/infiniband/ulp/sdp/sdp_proc.c b/drivers/infiniband/ulp/sdp/sdp_proc.c
index a074982a055322117c270ef8c620d41b43434a48..2da8e402d85cb7547c5f884ae588155ffec08333 100644 (file)
--- a/drivers/infiniband/ulp/sdp/sdp_proc.c
+++ b/drivers/infiniband/ulp/sdp/sdp_proc.c
@@ -170,7 +170,7 @@ static int sdp_seq_open(struct inode *inode, struct file *file)
 #define _kzalloc(size,flags) kzalloc(size,flags)
 #undef kzalloc
        s = kzalloc(sizeof(*s), GFP_KERNEL);
-#define kzalloc(s,f) _kzalloc(s,f)     
+#define kzalloc(s,f) _kzalloc(s,f)
        if (!s)
                return -ENOMEM;
        s->family               = afinfo->family;
@@ -219,7 +219,7 @@ static void sdpstats_seq_hist(struct seq_file *seq, char *str, u32 *h, int n,
 
                if (first == -1 && h[i])
                        first = i;
-               
+
                if (h[i])
                        last = i;
        }
@@ -246,7 +246,7 @@ static void sdpstats_seq_hist(struct seq_file *seq, char *str, u32 *h, int n,
        for_each_possible_cpu(__i)                              \
                __val += per_cpu(sdpstats, __i).var;            \
        __val;                                                  \
-})     
+})
 
 #define SDPSTATS_HIST_GET(hist, hist_len, sum) ({ \
        unsigned int __i;                                       \
@@ -528,7 +528,7 @@ no_mem_stats:
 #endif
        proc_net_remove(&init_net, sdp_seq_afinfo.name);
 
-no_mem:        
+no_mem:
        return -ENOMEM;
 }
 

diff --git a/drivers/infiniband/ulp/sdp/sdp_rx.c b/drivers/infiniband/ulp/sdp/sdp_rx.c
index e31ce2eed243fbbbe8c6af950715c0d6b55a0de4..f566522c24bca4d514c1b64ce0dd8bafb802c940 100644 (file)
--- a/drivers/infiniband/ulp/sdp/sdp_rx.c
+++ b/drivers/infiniband/ulp/sdp/sdp_rx.c
@@ -320,7 +320,7 @@ static inline struct sk_buff *sdp_sock_queue_rcv_skb(struct sock *sk,
        if (h->mid == SDP_MID_SRCAVAIL) {
                struct sdp_srcah *srcah = (struct sdp_srcah *)(h+1);
                struct rx_srcavail_state *rx_sa;
-               
+
                ssk->srcavail_cancel_mseq = 0;
 
                ssk->rx_sa = rx_sa = RX_SRCAVAIL_STATE(skb) = kzalloc(
@@ -504,7 +504,7 @@ static int sdp_process_rx_ctl_skb(struct sdp_sock *ssk, struct sk_buff *skb)
                if (ssk->rx_sa) {
                        ssk->srcavail_cancel_mseq = ntohl(h->mseq);
                        ssk->rx_sa->flags |= RX_SA_ABORTED;
-                       ssk->rx_sa = NULL; /* TODO: change it into SDP_MID_DATA and get 
+                       ssk->rx_sa = NULL; /* TODO: change it into SDP_MID_DATA and get
                                              the dirty logic from recvmsg */
                } else {
                        sdp_dbg(sk, "Got SrcAvailCancel - "
@@ -867,7 +867,7 @@ int sdp_process_rx(struct sdp_sock *ssk)
                if (posts_handler(ssk) || (sk->sk_socket &&
                        test_bit(SOCK_ASYNC_WAITDATA, &sk->sk_socket->flags))) {
 
-                       sdp_prf(&ssk->isk.sk, NULL, 
+                       sdp_prf(&ssk->isk.sk, NULL,
                                "Somebody is doing the post work for me. %d",
                                posts_handler(ssk));
 

diff --git a/drivers/infiniband/ulp/sdp/sdp_tx.c b/drivers/infiniband/ulp/sdp/sdp_tx.c
index 7dc471dd0b304c29c6529a8b4f551fa5fd9f993f..af93cacd4f36310824fb1827cb1716997b485c8d 100644 (file)
--- a/drivers/infiniband/ulp/sdp/sdp_tx.c
+++ b/drivers/infiniband/ulp/sdp/sdp_tx.c
@@ -168,7 +168,7 @@ void sdp_post_send(struct sdp_sock *ssk, struct sk_buff *skb)
        return;
 
 err:
-       __kfree_skb(skb);               
+       __kfree_skb(skb);
 }
 
 static struct sk_buff *sdp_send_completion(struct sdp_sock *ssk, int mseq)
@@ -304,7 +304,7 @@ static int sdp_process_tx_cq(struct sdp_sock *ssk)
        if (wc_processed) {
                struct sock *sk = &ssk->isk.sk;
                sdp_post_sends(ssk, GFP_ATOMIC);
-               sdp_prf1(sk, NULL, "Waking sendmsg. inflight=%d", 
+               sdp_prf1(sk, NULL, "Waking sendmsg. inflight=%d",
                                (u32) tx_ring_posted(ssk));
                sk_stream_write_space(&ssk->isk.sk);
                if (sk->sk_write_pending &&
@@ -326,7 +326,7 @@ static int sdp_process_tx_cq(struct sdp_sock *ssk)
  * - a write is pending - wake it up and let it do the poll + post
  * - post handler is taken - taker will do the poll + post
  * else return 1 and let the caller do it
- */  
+ */
 static int sdp_tx_handler_select(struct sdp_sock *ssk)
 {
        struct sock *sk = &ssk->isk.sk;
@@ -347,7 +347,7 @@ static int sdp_tx_handler_select(struct sdp_sock *ssk)
                /* Somebody else available to check for completion */
                sdp_prf1(sk, NULL, "Somebody else will call do_posts");
                return 0;
-       } 
+       }
 
        return 1;
 }
@@ -358,7 +358,7 @@ static void sdp_poll_tx_timeout(unsigned long data)
        struct sock *sk = &ssk->isk.sk;
        u32 inflight, wc_processed;
 
-       sdp_prf1(&ssk->isk.sk, NULL, "TX timeout: inflight=%d, head=%d tail=%d", 
+       sdp_prf1(&ssk->isk.sk, NULL, "TX timeout: inflight=%d, head=%d tail=%d",
                (u32) tx_ring_posted(ssk),
                ring_head(ssk->tx_ring), ring_tail(ssk->tx_ring));
 

diff --git a/drivers/infiniband/ulp/sdp/sdp_zcopy.c b/drivers/infiniband/ulp/sdp/sdp_zcopy.c
index 4a7700cad39ccf7f20292b4c9935634e4a371cfe..36559ede518c4380f558f19add2b7c31111edf6d 100644 (file)
--- a/drivers/infiniband/ulp/sdp/sdp_zcopy.c
+++ b/drivers/infiniband/ulp/sdp/sdp_zcopy.c
@@ -39,7 +39,7 @@
 #include <rdma/rdma_cm.h>
 #include <rdma/ib_verbs.h>
 #include <rdma/ib_fmr_pool.h>
-#include <rdma/ib_umem.h> 
+#include <rdma/ib_umem.h>
 #include <net/tcp.h> /* for memcpy_toiovec */
 #include <asm/io.h>
 #include <asm/uaccess.h>
@@ -75,8 +75,8 @@ static int sdp_post_srcavail(struct sock *sk, struct tx_srcavail_state *tx_sa)
                return -ENOMEM;
        }
        sdp_dbg_data(sk, "sending SrcAvail\n");
-               
-       TX_SRCAVAIL_STATE(skb) = tx_sa; /* tx_sa is hanged on the skb 
+
+       TX_SRCAVAIL_STATE(skb) = tx_sa; /* tx_sa is hanged on the skb
                                         * but continue to live after skb is freed */
        ssk->tx_sa = tx_sa;
 
@@ -97,7 +97,7 @@ static int sdp_post_srcavail(struct sock *sk, struct tx_srcavail_state *tx_sa)
        skb->truesize        += payload_len;
 
        sdp_skb_entail(sk, skb);
-       
+
        ssk->write_seq += payload_len;
        SDP_SKB_CB(skb)->end_seq += payload_len;
 
@@ -201,7 +201,7 @@ static int sdp_wait_rdmardcompl(struct sdp_sock *ssk, long *timeo_p,
                sk_wait_event(sk, &current_timeo,
                                tx_sa->abort_flags &&
                                ssk->rx_sa &&
-                               (tx_sa->bytes_acked < tx_sa->bytes_sent) && 
+                               (tx_sa->bytes_acked < tx_sa->bytes_sent) &&
                                vm_wait);
                sdp_prf(&ssk->isk.sk, NULL, "woke up sleepers");
 
@@ -262,7 +262,7 @@ static void sdp_wait_rdma_wr_finished(struct sdp_sock *ssk)
                posts_handler_put(ssk);
 
                sdp_prf1(sk, NULL, "Going to sleep");
-               sk_wait_event(sk, &timeo, 
+               sk_wait_event(sk, &timeo,
                        !ssk->tx_ring.rdma_inflight->busy);
                sdp_prf1(sk, NULL, "Woke up");
                sdp_dbg_data(&ssk->isk.sk, "woke up sleepers\n");
@@ -494,7 +494,7 @@ static int sdp_alloc_fmr(struct sock *sk, void *uaddr, size_t len,
 
        return 0;
 
-err_fmr_alloc: 
+err_fmr_alloc:
        free_page((unsigned long) pages);
 
 err_pages_alloc:
@@ -714,7 +714,7 @@ err_no_tx_slots:
        sdp_free_fmr(sk, &tx_sa->fmr, &tx_sa->umem);
 
 err_alloc_fmr:
-       return rc;      
+       return rc;
 }
 
 int sdp_sendmsg_zcopy(struct kiocb *iocb, struct sock *sk, struct iovec *iov)