Merge branches 'for-3.15/upstream-fixes' and 'for-3.16/upstream' into for-linus

[firefly-linux-kernel-4.4.55.git] / drivers / ntb / ntb_hw.h

diff --git a/drivers/ntb/ntb_hw.h b/drivers/ntb/ntb_hw.h
index d1960ffb4bbc95d0ee02e13432470c9ddfc07707..465517b7393efe4e995d323dc20f48b1eab859ae 100644 (file)
--- a/drivers/ntb/ntb_hw.h
+++ b/drivers/ntb/ntb_hw.h
@@ -61,8 +61,6 @@
 #define PCI_DEVICE_ID_INTEL_NTB_SS_HSX         0x2F0F
 #define PCI_DEVICE_ID_INTEL_NTB_B2B_BWD                0x0C4E
 
-#define msix_table_size(control)       ((control & PCI_MSIX_FLAGS_QSIZE)+1)
-
 #ifndef readq
 static inline u64 readq(void __iomem *addr)
 {
@@ -231,7 +229,7 @@ int ntb_register_db_callback(struct ntb_device *ndev, unsigned int idx,
                                                           int db_num));
 void ntb_unregister_db_callback(struct ntb_device *ndev, unsigned int idx);
 int ntb_register_event_callback(struct ntb_device *ndev,
-                               void (*event_cb_func) (void *handle,
+                               void (*event_cb_func)(void *handle,
                                                      enum ntb_hw_event event));
 void ntb_unregister_event_callback(struct ntb_device *ndev);
 int ntb_get_max_spads(struct ntb_device *ndev);