Merge tag 'pci-v4.11-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaa...

[mirror_ubuntu-bionic-kernel.git] / drivers / net / ethernet / amd / xgbe / xgbe.h

diff --git a/drivers/net/ethernet/amd/xgbe/xgbe.h b/drivers/net/ethernet/amd/xgbe/xgbe.h
index 00108815b55eeb1417bd83bea4c9fbb7aa101fe1..f9a24639f5741bdc0d534cd7b155ad50acdb45c1 100644 (file)
--- a/drivers/net/ethernet/amd/xgbe/xgbe.h
+++ b/drivers/net/ethernet/amd/xgbe/xgbe.h
@@ -211,9 +211,9 @@
 #define XGBE_MAC_PROP_OFFSET   0x1d000
 #define XGBE_I2C_CTRL_OFFSET   0x1e000
 
-/* PCI MSIx support */
-#define XGBE_MSIX_BASE_COUNT   4
-#define XGBE_MSIX_MIN_COUNT    (XGBE_MSIX_BASE_COUNT + 1)
+/* PCI MSI/MSIx support */
+#define XGBE_MSI_BASE_COUNT    4
+#define XGBE_MSI_MIN_COUNT     (XGBE_MSI_BASE_COUNT + 1)
 
 /* PCI clock frequencies */
 #define XGBE_V2_DMA_CLOCK_FREQ 500000000       /* 500 MHz */
@@ -982,14 +982,12 @@ struct xgbe_prv_data {
        unsigned int desc_ded_count;
        unsigned int desc_sec_count;
 
-       struct msix_entry *msix_entries;
        int dev_irq;
        int ecc_irq;
        int i2c_irq;
        int channel_irq[XGBE_MAX_DMA_CHANNELS];
 
        unsigned int per_channel_irq;
-       unsigned int irq_shared;
        unsigned int irq_count;
        unsigned int channel_irq_count;
        unsigned int channel_irq_mode;