diff options
| author | Edward Cree <ecree@solarflare.com> | 2017-12-18 17:55:50 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-12-18 19:07:49 +0100 |
| commit | 03714bbb22ebe00bc07d83c526b16377c67daa3f (patch) | |
| tree | 19399ea52e41cae79037652a5c725d8a05f250f5 /drivers/net/ethernet/sfc/efx.c | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next (diff) | |
| download | linux-03714bbb22ebe00bc07d83c526b16377c67daa3f.tar.xz linux-03714bbb22ebe00bc07d83c526b16377c67daa3f.zip | |
sfc: make mem_bar a function rather than a constant
Support using BAR 0 on SFC9250, even though the driver doesn't bind to such
devices yet.
Signed-off-by: Edward Cree <ecree@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/sfc/efx.c')
| -rw-r--r-- | drivers/net/ethernet/sfc/efx.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/sfc/efx.c b/drivers/net/ethernet/sfc/efx.c index e3c492fcaff0..bbe4ace7dd9d 100644 --- a/drivers/net/ethernet/sfc/efx.c +++ b/drivers/net/ethernet/sfc/efx.c @@ -1248,7 +1248,7 @@ static int efx_init_io(struct efx_nic *efx) netif_dbg(efx, probe, efx->net_dev, "initialising I/O\n"); - bar = efx->type->mem_bar; + bar = efx->type->mem_bar(efx); rc = pci_enable_device(pci_dev); if (rc) { @@ -1323,7 +1323,7 @@ static void efx_fini_io(struct efx_nic *efx) } if (efx->membase_phys) { - bar = efx->type->mem_bar; + bar = efx->type->mem_bar(efx); pci_release_region(efx->pci_dev, bar); efx->membase_phys = 0; } |