From: Michael S. Tsirkin Date: Sun, 6 May 2007 08:18:56 +0000 (+0300) Subject: IB/sdp: Cleanup compilation warnings. X-Git-Tag: v4.1.12-92~264^2~5^2~352 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=05d067b87cec23e6c308c3cfd61886407cfbd5f3;p=users%2Fjedix%2Flinux-maple.git IB/sdp: Cleanup compilation warnings. workqueue function gets passed work_struct sizeof should be printed with %zd Signed-off-by: Michael S. Tsirkin --- diff --git a/drivers/infiniband/ulp/sdp/sdp.h b/drivers/infiniband/ulp/sdp/sdp.h index eb5f7526d4944..70354151cecdc 100644 --- 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 822e0d1509c8b..e5004b25c7717 100644 --- 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 2560f031c95a1..7773c15bf906c 100644 --- 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__);