xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

be2net: remove pci_func field from be_adapter struct

Browse Source 
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>
This commit is contained in:
Sathya Perla
2009-07-27 22:52:23 +00:00
committed by David S. Miller
parent 8788fdc2a5
commit eec368fb3c
4 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/net/benet/be_main.c
View File

@@ -1279,7 +1279,7 @@ static irqreturn_t be_intx(int irq, void *dev)
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 void be_msix_enable(struct be_adapter *adapter)
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 @@ static int be_ctrl_init(struct be_adapter *adapter)
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 @@ static int be_ctrl_init(struct be_adapter *adapter)
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;
}