sdp: fixed sparse warnings

Signed-off-by: Amir Vadai <amirv@mellanox.co.il>

diff --git a/drivers/infiniband/ulp/sdp/sdp_main.c b/drivers/infiniband/ulp/sdp/sdp_main.c
index 24d413ff72347119136709997ee9825a7a5a9a59..929609fca3dbb7804ce8491666d877d1e990bafa 100644 (file)
--- a/drivers/infiniband/ulp/sdp/sdp_main.c
+++ b/drivers/infiniband/ulp/sdp/sdp_main.c
@@ -108,9 +108,9 @@ SDP_MODPARAM_SINT(sdp_rx_rate_thresh, (200000 / SDP_RX_COAL_TIME_HIGH),
        "rx rate thresh ().");
 SDP_MODPARAM_SINT(sdp_sample_interval, (HZ / 4), "sample interval (jiffies).");
 
-SDP_MODPARAM_INT(hw_int_mod_count, -1,
+SDP_MODPARAM_SINT(hw_int_mod_count, -1,
                "forced hw int moderation val. -1 for auto (packets).");
-SDP_MODPARAM_INT(hw_int_mod_usec, -1,
+SDP_MODPARAM_SINT(hw_int_mod_usec, -1,
                "forced hw int moderation val. -1 for auto (usec).");
 
 struct workqueue_struct *sdp_wq;
@@ -121,8 +121,6 @@ spinlock_t sock_list_lock;
 
 static DEFINE_RWLOCK(device_removal_lock);
 
-static inline void sdp_start_dreq_wait_timeout(struct sdp_sock *ssk, int timeo);
-
 static inline unsigned int sdp_keepalive_time_when(const struct sdp_sock *ssk)
 {
        return ssk->keepalive_time ? : sdp_keepalive_time;
@@ -542,6 +540,14 @@ done:
        sdp_dbg(sk, "%s done\n", __func__);
 }
 
+static inline void sdp_start_dreq_wait_timeout(struct sdp_sock *ssk, int timeo)
+{
+       sdp_dbg(&ssk->isk.sk, "Starting dreq wait timeout\n");
+
+       queue_delayed_work(sdp_wq, &ssk->dreq_wait_work, timeo);
+       ssk->dreq_wait_timeout = 1;
+}
+
 static void sdp_send_disconnect(struct sock *sk)
 {
        sock_hold(sk, SOCK_REF_DREQ_TO);
@@ -939,14 +945,6 @@ static int sdp_ioctl(struct sock *sk, int cmd, unsigned long arg)
        return put_user(answ, (int __user *)arg);
 }
 
-static inline void sdp_start_dreq_wait_timeout(struct sdp_sock *ssk, int timeo)
-{
-       sdp_dbg(&ssk->isk.sk, "Starting dreq wait timeout\n");
-
-       queue_delayed_work(sdp_wq, &ssk->dreq_wait_work, timeo);
-       ssk->dreq_wait_timeout = 1;
-}
-
 void sdp_cancel_dreq_wait_timeout(struct sdp_sock *ssk)
 {
        if (!ssk->dreq_wait_timeout)

diff --git a/drivers/infiniband/ulp/sdp/sdp_proc.c b/drivers/infiniband/ulp/sdp/sdp_proc.c
index 9b00255871a8b445ae804e86b8ca44a2c9bd69ab..02ad8606a7abd47aee22d8e628366a703a32ed48 100644 (file)
--- a/drivers/infiniband/ulp/sdp/sdp_proc.c
+++ b/drivers/infiniband/ulp/sdp/sdp_proc.c
@@ -378,7 +378,7 @@ static void sdpprf_stop(struct seq_file *p, void *v)
 {
 }
 
-struct seq_operations sdpprf_ops = {
+static struct seq_operations sdpprf_ops = {
        .start = sdpprf_start,
        .stop = sdpprf_stop,
        .next = sdpprf_next,
@@ -415,8 +415,12 @@ static struct file_operations sdpprf_fops = {
 int __init sdp_proc_init(void)
 {
        struct proc_dir_entry *p = NULL;
-       struct proc_dir_entry *sdpstats = NULL;
-       struct proc_dir_entry *sdpprf = NULL;
+#ifdef SDPSTATS_ON
+       struct proc_dir_entry *stats = NULL;
+#endif
+#ifdef SDP_PROFILING
+       struct proc_dir_entry *prof = NULL;
+#endif
 
        sdp_seq_afinfo.seq_fops->owner         = sdp_seq_afinfo.owner;
        sdp_seq_afinfo.seq_fops->open          = sdp_seq_open;
@@ -433,31 +437,34 @@ int __init sdp_proc_init(void)
 
 #ifdef SDPSTATS_ON
 
-       sdpstats = proc_net_fops_create(&init_net, PROC_SDP_STATS,
+       stats = proc_net_fops_create(&init_net, PROC_SDP_STATS,
                        S_IRUGO | S_IWUGO, &sdpstats_fops);
-       if (!sdpstats)
-               goto no_mem;
+       if (!stats)
+               goto no_mem_stats;
 
 #endif
 
 #ifdef SDP_PROFILING
-       sdpprf = proc_net_fops_create(&init_net, PROC_SDP_PERF,
+       prof = proc_net_fops_create(&init_net, PROC_SDP_PERF,
                        S_IRUGO | S_IWUGO, &sdpprf_fops);
-       if (!sdpprf)
-               goto no_mem;
+       if (!prof)
+               goto no_mem_prof;
 #endif
 
        return 0;
-no_mem:
-       if (sdpprf)
-               proc_net_remove(&init_net, PROC_SDP_PERF);
 
-       if (sdpstats)
-               proc_net_remove(&init_net, PROC_SDP_STATS);
+#ifdef SDP_PROFILING
+no_mem_prof:
+#endif
+
+#ifdef SDPSTATS_ON
+       proc_net_remove(&init_net, PROC_SDP_STATS);
 
-       if (p)
-               proc_net_remove(&init_net, sdp_seq_afinfo.name);
+no_mem_stats:
+#endif
+       proc_net_remove(&init_net, sdp_seq_afinfo.name);
 
+no_mem:        
        return -ENOMEM;
 }
 

diff --git a/drivers/infiniband/ulp/sdp/sdp_rx.c b/drivers/infiniband/ulp/sdp/sdp_rx.c
index b14e2c7c145b4565c66563fdf2e85431e66aa6a5..4f71bb38267eeea9badbe100db2b48d6a310e151 100644 (file)
--- a/drivers/infiniband/ulp/sdp/sdp_rx.c
+++ b/drivers/infiniband/ulp/sdp/sdp_rx.c
@@ -148,7 +148,7 @@ static int sdp_post_recv(struct sdp_sock *ssk)
        int i, rc, frags;
        u64 addr;
        struct ib_device *dev;
-       struct ib_recv_wr rx_wr = { 0 };
+       struct ib_recv_wr rx_wr = { NULL };
        struct ib_sge ibsge[SDP_MAX_RECV_SKB_FRAGS + 1];
        struct ib_sge *sge = ibsge;
        struct ib_recv_wr *bad_wr;
@@ -721,7 +721,7 @@ static int sdp_poll_rx_cq(struct sdp_sock *ssk)
        return wc_processed;
 }
 
-void sdp_rx_comp_work(struct work_struct *work)
+static void sdp_rx_comp_work(struct work_struct *work)
 {
        struct sdp_sock *ssk = container_of(work, struct sdp_sock,
                        rx_comp_work);

diff --git a/drivers/infiniband/ulp/sdp/sdp_tx.c b/drivers/infiniband/ulp/sdp/sdp_tx.c
index 18d89ebfc31c7305dfbee690814dadc6ad28abb7..8ec612585281a3407e17d7d2e940d0022a006eb5 100644 (file)
--- a/drivers/infiniband/ulp/sdp/sdp_tx.c
+++ b/drivers/infiniband/ulp/sdp/sdp_tx.c
@@ -74,7 +74,7 @@ void sdp_post_send(struct sdp_sock *ssk, struct sk_buff *skb)
 
        struct ib_sge ibsge[SDP_MAX_SEND_SKB_FRAGS + 1];
        struct ib_sge *sge = ibsge;
-       struct ib_send_wr tx_wr = { 0 };
+       struct ib_send_wr tx_wr = { NULL };
 
        SDPSTATS_COUNTER_MID_INC(post_send, h->mid);
        SDPSTATS_HIST(send_size, skb->len);
@@ -419,7 +419,7 @@ static void sdp_tx_irq(struct ib_cq *cq, void *cq_context)
        }
 }
 
-void sdp_tx_ring_purge(struct sdp_sock *ssk)
+static void sdp_tx_ring_purge(struct sdp_sock *ssk)
 {
        while (tx_ring_posted(ssk)) {
                struct sk_buff *skb;

diff --git a/drivers/infiniband/ulp/sdp/sdp_zcopy.c b/drivers/infiniband/ulp/sdp/sdp_zcopy.c
index 373b6bee1ff8b582ef2b8c5c532fadd38df9d4c3..574a43928d5cd0715434bdca5eb6512656f01ccb 100644 (file)
--- a/drivers/infiniband/ulp/sdp/sdp_zcopy.c
+++ b/drivers/infiniband/ulp/sdp/sdp_zcopy.c
@@ -465,7 +465,7 @@ err:
        return -1;
 }
 
-void sdp_put_pages(struct sock *sk, struct page **pages, int page_cnt)
+static void sdp_put_pages(struct sock *sk, struct page **pages, int page_cnt)
 {
        int i;
        sdp_dbg_data(sk, "count: %d\n", page_cnt);
@@ -551,8 +551,9 @@ static int sdp_map_dma_sge(struct sock *sk, struct ib_sge *sge, int page_cnt,
                }
                sge[i].addr += o;
 
-               sdp_dbg_data(sk, "mapping %03d: page: %p o: %d l: %d | addr: 0x%llx length: %d\n",
-                               i, pages[i], o, l, sge[i].addr, sge[i].length);
+               sdp_dbg_data(sk, "mapping %03d: page: %p o: %d l: %d | "
+                       "addr: 0x%llx length: %d\n",
+                       i, pages[i], o, l, sge[i].addr, sge[i].length);
                left -= l;
        }
 
@@ -636,7 +637,7 @@ int sdp_rdma_to_iovec(struct sock *sk, struct iovec *iov, struct sk_buff *skb,
        struct rx_srcavail_state *rx_sa = RX_SRCAVAIL_STATE(skb);
        int rc = 0;
        struct ib_send_wr *bad_wr;
-       struct ib_send_wr wr = { 0 };
+       struct ib_send_wr wr = { NULL };
        long timeo;
        struct ib_sge *sge;
        int sge_left;