rds: fix compilation warnings

net/rds/ib_recv.c: In function 'rds_ib_srq_event':
net/rds/ib_recv.c:1490: warning: too many arguments for format
net/rds/ib_recv.c:1484: warning: unused variable 'srq_attr'
net/rds/ib_recv.c: In function 'rds_ib_srq_init':
net/rds/ib_recv.c:1524: warning: passing argument 1 of 'ERR_PTR' makes
integer from pointer without a cast
include/linux/err.h:20: note: expected 'long int' but argument is of
type 'struct ib_srq *'
net/rds/ib_recv.c:1524: warning: format '%d' expects type 'int', but
argument 2 has type 'void *'

Signed-off-by: Dotan Barak <dotanb@dev.mellanox.co.il>

diff --git a/net/rds/ib_recv.c b/net/rds/ib_recv.c
index 56821fa573032382f24f5234f95ec35391c10eda..8acde3eb0c98e55bf3cc51a91370d4f1ac3fd5b8 100644 (file)
--- a/net/rds/ib_recv.c
+++ b/net/rds/ib_recv.c
@@ -1481,13 +1481,11 @@ void rds_ib_srq_rearm(struct work_struct *work)
 static void rds_ib_srq_event(struct ib_event *event,
                                void *ctx)
 {
-       struct ib_srq_attr srq_attr;
        struct rds_ib_device *rds_ibdev = ctx;
 
        switch (event->event) {
        case IB_EVENT_SRQ_ERR:
-               printk(KERN_ERR "RDS: event IB_EVENT_SRQ_ERR unhandled\n",
-                               event->event);
+               printk(KERN_ERR "RDS: event IB_EVENT_SRQ_ERR unhandled\n");
                break;
        case IB_EVENT_SRQ_LIMIT_REACHED:
                rds_ib_stats_inc(s_ib_srq_lows);
@@ -1520,8 +1518,8 @@ int rds_ib_srq_init(struct rds_ib_device *rds_ibdev)
                                &srq_init_attr);
 
        if (IS_ERR(rds_ibdev->srq->s_srq)) {
-               printk(KERN_WARNING "RDS: ib_create_srq failed %d\n",
-                       ERR_PTR(rds_ibdev->srq->s_srq));
+               printk(KERN_WARNING "RDS: ib_create_srq failed %ld\n",
+                       PTR_ERR(rds_ibdev->srq->s_srq));
                return 1;
        }