summaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/atheros/alx/alx.h
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2017-04-11 13:01:21 +0200
committerDavid S. Miller <davem@davemloft.net>2017-04-11 11:16:02 -0400
commitf3297f686db084465347c83edfcd1527994e7a9f (patch)
tree220af737805f5361f8be8dc3337cadb95d23e751 /drivers/net/ethernet/atheros/alx/alx.h
parentc6606a87dbb67ef79fc129c81e161f7791a1f047 (diff)
downloadlinux-f3297f686db084465347c83edfcd1527994e7a9f.tar.bz2
net: alx: switch to pci_alloc_irq_vectors
Remove the deprecated pci_enable_msix API in favour of its successor, and make sure to handle errors during IRQ setup properly. Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/atheros/alx/alx.h')
-rw-r--r--drivers/net/ethernet/atheros/alx/alx.h6
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/net/ethernet/atheros/alx/alx.h b/drivers/net/ethernet/atheros/alx/alx.h
index d4a409139ea2..78c5de467426 100644
--- a/drivers/net/ethernet/atheros/alx/alx.h
+++ b/drivers/net/ethernet/atheros/alx/alx.h
@@ -102,9 +102,6 @@ struct alx_napi {
#define ALX_MAX_NAPIS 8
-#define ALX_FLAG_USING_MSIX BIT(0)
-#define ALX_FLAG_USING_MSI BIT(1)
-
struct alx_priv {
struct net_device *dev;
@@ -112,7 +109,6 @@ struct alx_priv {
/* msi-x vectors */
int num_vec;
- struct msix_entry *msix_entries;
/* all descriptor memory */
struct {
@@ -139,8 +135,6 @@ struct alx_priv {
u16 msg_enable;
- int flags;
-
/* protects hw.stats */
spinlock_t stats_lock;
};