浏览代码

[IPoIB] don't compile debug code if debugging isn't enabled

Don't build ipoib_mcast_iter_ functions if CONFIG_INFINIBAND_IPOIB_DEBUG
is not enabled -- their only callers will not be built either.

Also move the prototype for ipoib_open() to ipoib.h to fix a sparse warning.

Signed-off-by: Roland Dreier <rolandd@cisco.com>
Roland Dreier 19 年之前
父节点
当前提交
8ae5a8a24f

+ 3 - 0
drivers/infiniband/ulp/ipoib/ipoib.h

@@ -235,6 +235,7 @@ static inline void ipoib_put_ah(struct ipoib_ah *ah)
 	kref_put(&ah->ref, ipoib_free_ah);
 	kref_put(&ah->ref, ipoib_free_ah);
 }
 }
 
 
+int ipoib_open(struct net_device *dev);
 int ipoib_add_pkey_attr(struct net_device *dev);
 int ipoib_add_pkey_attr(struct net_device *dev);
 
 
 void ipoib_send(struct net_device *dev, struct sk_buff *skb,
 void ipoib_send(struct net_device *dev, struct sk_buff *skb,
@@ -267,6 +268,7 @@ int ipoib_mcast_stop_thread(struct net_device *dev, int flush);
 void ipoib_mcast_dev_down(struct net_device *dev);
 void ipoib_mcast_dev_down(struct net_device *dev);
 void ipoib_mcast_dev_flush(struct net_device *dev);
 void ipoib_mcast_dev_flush(struct net_device *dev);
 
 
+#ifdef CONFIG_INFINIBAND_IPOIB_DEBUG
 struct ipoib_mcast_iter *ipoib_mcast_iter_init(struct net_device *dev);
 struct ipoib_mcast_iter *ipoib_mcast_iter_init(struct net_device *dev);
 void ipoib_mcast_iter_free(struct ipoib_mcast_iter *iter);
 void ipoib_mcast_iter_free(struct ipoib_mcast_iter *iter);
 int ipoib_mcast_iter_next(struct ipoib_mcast_iter *iter);
 int ipoib_mcast_iter_next(struct ipoib_mcast_iter *iter);
@@ -276,6 +278,7 @@ void ipoib_mcast_iter_read(struct ipoib_mcast_iter *iter,
 				  unsigned int *queuelen,
 				  unsigned int *queuelen,
 				  unsigned int *complete,
 				  unsigned int *complete,
 				  unsigned int *send_only);
 				  unsigned int *send_only);
+#endif
 
 
 int ipoib_mcast_attach(struct net_device *dev, u16 mlid,
 int ipoib_mcast_attach(struct net_device *dev, u16 mlid,
 		       union ib_gid *mgid);
 		       union ib_gid *mgid);

+ 0 - 1
drivers/infiniband/ulp/ipoib/ipoib_ib.c

@@ -636,7 +636,6 @@ void ipoib_ib_dev_cleanup(struct net_device *dev)
  * Bug #2507. This implementation will probably be removed when the P_Key
  * Bug #2507. This implementation will probably be removed when the P_Key
  * change async notification is available.
  * change async notification is available.
  */
  */
-int ipoib_open(struct net_device *dev);
 
 
 static void ipoib_pkey_dev_check_presence(struct net_device *dev)
 static void ipoib_pkey_dev_check_presence(struct net_device *dev)
 {
 {

+ 4 - 0
drivers/infiniband/ulp/ipoib/ipoib_multicast.c

@@ -917,6 +917,8 @@ void ipoib_mcast_restart_task(void *dev_ptr)
 		ipoib_mcast_start_thread(dev);
 		ipoib_mcast_start_thread(dev);
 }
 }
 
 
+#ifdef CONFIG_INFINIBAND_IPOIB_DEBUG
+
 struct ipoib_mcast_iter *ipoib_mcast_iter_init(struct net_device *dev)
 struct ipoib_mcast_iter *ipoib_mcast_iter_init(struct net_device *dev)
 {
 {
 	struct ipoib_mcast_iter *iter;
 	struct ipoib_mcast_iter *iter;
@@ -989,3 +991,5 @@ void ipoib_mcast_iter_read(struct ipoib_mcast_iter *iter,
 	*complete  = iter->complete;
 	*complete  = iter->complete;
 	*send_only = iter->send_only;
 	*send_only = iter->send_only;
 }
 }
+
+#endif /* CONFIG_INFINIBAND_IPOIB_DEBUG */