IB/sdp: Cleanup compilation warnings.

workqueue function gets passed work_struct sizeof should be printed with %zd

Signed-off-by: Michael S. Tsirkin <mst@dev.mellanox.co.il>

diff --git a/drivers/infiniband/ulp/sdp/sdp.h b/drivers/infiniband/ulp/sdp/sdp.h
index eb5f7526d4944ab50bc7a824abf74e0e0247604d..70354151cecdc7d55136a0400410af1853e7fa82 100644 (file)
--- a/drivers/infiniband/ulp/sdp/sdp.h
+++ b/drivers/infiniband/ulp/sdp/sdp.h
@@ -199,7 +199,7 @@ void sdp_post_recvs(struct sdp_sock *ssk);
 int sdp_poll_cq(struct sdp_sock *ssk, struct ib_cq *cq);
 void sdp_post_sends(struct sdp_sock *ssk, int nonagle);
 void sdp_destroy_work(struct work_struct *work);
-void sdp_time_wait_work(struct delayed_work *work);
+void sdp_time_wait_work(struct work_struct *work);
 struct sk_buff *sdp_recv_completion(struct sdp_sock *ssk, int id);
 struct sk_buff *sdp_send_completion(struct sdp_sock *ssk, int mseq);
 void sdp_urg(struct sdp_sock *ssk, struct sk_buff *skb);

diff --git a/drivers/infiniband/ulp/sdp/sdp_bcopy.c b/drivers/infiniband/ulp/sdp/sdp_bcopy.c
index 822e0d1509c8ba592a48844b50bb92d97b5a3e0f..e5004b25c7717d0c7bb79d509e83268ab67fd3be 100644 (file)
--- a/drivers/infiniband/ulp/sdp/sdp_bcopy.c
+++ b/drivers/infiniband/ulp/sdp/sdp_bcopy.c
@@ -427,7 +427,7 @@ static void sdp_handle_wc(struct sdp_sock *ssk, struct ib_wc *wc)
                                     "Recv completion. ID %d Length %d\n",
                                     (int)wc->wr_id, wc->byte_len);
                        if (unlikely(wc->byte_len < sizeof(struct sdp_bsdh))) {
-                               printk("SDP BUG! byte_len %d < %d\n",
+                               printk("SDP BUG! byte_len %d < %zd\n",
                                       wc->byte_len, sizeof(struct sdp_bsdh));
                                __kfree_skb(skb);
                                return;

diff --git a/drivers/infiniband/ulp/sdp/sdp_main.c b/drivers/infiniband/ulp/sdp/sdp_main.c
index 2560f031c95a18ed104a4a837fa571ca0b90e97d..7773c15bf906c1399c93cb6599e438ebbc2eea51 100644 (file)
--- a/drivers/infiniband/ulp/sdp/sdp_main.c
+++ b/drivers/infiniband/ulp/sdp/sdp_main.c
@@ -720,9 +720,9 @@ void sdp_destroy_work(struct work_struct *work)
        sock_put(sk);
 }
 
-void sdp_time_wait_work(struct delayed_work *work)
+void sdp_time_wait_work(struct work_struct *work)
 {
-       struct sdp_sock *ssk = container_of(work, struct sdp_sock, time_wait_work);
+       struct sdp_sock *ssk = container_of(work, struct sdp_sock, time_wait_work.work);
        struct sock *sk = &ssk->isk.sk;
        lock_sock(sk);
        sdp_dbg(sk, "%s\n", __func__);