Ver Fonte

rdma/core: Fix sparse warnings

Clean up sparse warnings in the rdma core layer.

Signed-off-by: Sean Hefty <sean.hefty@intel.com>
Signed-off-by: Roland Dreier <roland@purestorage.com>
Sean Hefty há 13 anos atrás
pai
commit
c89d1bedf8

+ 0 - 3
drivers/infiniband/core/ucm.c

@@ -106,9 +106,6 @@ enum {
 	IB_UCM_MAX_DEVICES = 32
 	IB_UCM_MAX_DEVICES = 32
 };
 };
 
 
-/* ib_cm and ib_user_cm modules share /sys/class/infiniband_cm */
-extern struct class cm_class;
-
 #define IB_UCM_BASE_DEV MKDEV(IB_UCM_MAJOR, IB_UCM_BASE_MINOR)
 #define IB_UCM_BASE_DEV MKDEV(IB_UCM_MAJOR, IB_UCM_BASE_MINOR)
 
 
 static void ib_ucm_add_one(struct ib_device *device);
 static void ib_ucm_add_one(struct ib_device *device);

+ 3 - 3
drivers/infiniband/core/uverbs_cmd.c

@@ -2446,9 +2446,9 @@ out_put:
 	return ret ? ret : in_len;
 	return ret ? ret : in_len;
 }
 }
 
 
-int __uverbs_create_xsrq(struct ib_uverbs_file *file,
-			 struct ib_uverbs_create_xsrq *cmd,
-			 struct ib_udata *udata)
+static int __uverbs_create_xsrq(struct ib_uverbs_file *file,
+				struct ib_uverbs_create_xsrq *cmd,
+				struct ib_udata *udata)
 {
 {
 	struct ib_uverbs_create_srq_resp resp;
 	struct ib_uverbs_create_srq_resp resp;
 	struct ib_usrq_object           *obj;
 	struct ib_usrq_object           *obj;

+ 1 - 1
include/rdma/ib_addr.h

@@ -281,7 +281,7 @@ static inline u16 rdma_get_vlan_id(union ib_gid *dgid)
 static inline struct net_device *rdma_vlan_dev_real_dev(const struct net_device *dev)
 static inline struct net_device *rdma_vlan_dev_real_dev(const struct net_device *dev)
 {
 {
 	return dev->priv_flags & IFF_802_1Q_VLAN ?
 	return dev->priv_flags & IFF_802_1Q_VLAN ?
-		vlan_dev_real_dev(dev) : 0;
+		vlan_dev_real_dev(dev) : NULL;
 }
 }
 
 
 #endif /* IB_ADDR_H */
 #endif /* IB_ADDR_H */

+ 3 - 0
include/rdma/ib_cm.h

@@ -38,6 +38,9 @@
 #include <rdma/ib_mad.h>
 #include <rdma/ib_mad.h>
 #include <rdma/ib_sa.h>
 #include <rdma/ib_sa.h>
 
 
+/* ib_cm and ib_user_cm modules share /sys/class/infiniband_cm */
+extern struct class cm_class;
+
 enum ib_cm_state {
 enum ib_cm_state {
 	IB_CM_IDLE,
 	IB_CM_IDLE,
 	IB_CM_LISTEN,
 	IB_CM_LISTEN,