be2net: remove pci_func field from be_adapter struct
pci function is available as PCI_FUNC(pdev->devfn); no need for a
separate field.
Signed-off-by: Sathya Perla <sathyap@serverengines.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
diff --git a/drivers/net/benet/be_main.c b/drivers/net/benet/be_main.c
index da5341f..9c8654d 100644
--- a/drivers/net/benet/be_main.c
+++ b/drivers/net/benet/be_main.c
@@ -1279,7 +1279,7 @@
int isr;
isr = ioread32(adapter->csr + CEV_ISR0_OFFSET +
- adapter->pci_func * CEV_ISR_SIZE);
+ be_pci_func(adapter) * CEV_ISR_SIZE);
if (!isr)
return IRQ_NONE;
@@ -1446,7 +1446,7 @@
static inline int be_msix_vec_get(struct be_adapter *adapter, u32 eq_id)
{
- return adapter->msix_entries[eq_id - 8 * adapter->pci_func].vector;
+ return adapter->msix_entries[eq_id - 8 * be_pci_func(adapter)].vector;
}
static int be_msix_register(struct be_adapter *adapter)
@@ -1743,7 +1743,6 @@
struct be_dma_mem *mbox_mem_alloc = &adapter->mbox_mem_alloced;
struct be_dma_mem *mbox_mem_align = &adapter->mbox_mem;
int status;
- u32 val;
status = be_map_pci_bars(adapter);
if (status)
@@ -1764,9 +1763,6 @@
spin_lock_init(&adapter->mcc_lock);
spin_lock_init(&adapter->mcc_cq_lock);
- val = ioread32(adapter->pcicfg + PCICFG_MEMBAR_CTRL_INT_CTRL_OFFSET);
- adapter->pci_func = (val >> MEMBAR_CTRL_INT_CTRL_PFUNC_SHIFT) &
- MEMBAR_CTRL_INT_CTRL_PFUNC_MASK;
return 0;
}