diff options
| author |   Jarod Wilson <jarod@redhat.com> | 2015-10-19 11:52:04 -0400 |
|---|---|---|
| committer |   Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2015-12-12 23:51:26 -0800 |
| commit | 7b06a6909555ffb0140733cc4420222604140b27 (patch) | |
| tree | 4e6c6b01f9323e047307bbda42fc2ad700b8d582 /drivers/net/ethernet/intel/igb/e1000_regs.h | |
| parent | igb: fix NULL derefs due to skipped SR-IOV enabling (diff) | |
| download | linux-dev-7b06a6909555ffb0140733cc4420222604140b27.tar.xz linux-dev-7b06a6909555ffb0140733cc4420222604140b27.zip | |
igb: improve handling of disconnected adapters
Clean up array_rd32 so that it uses igb_rd32 the same as rd32, per the
suggestion of Alexander Duyck, and use io_addr in more places, so that
we don't have the need to call E1000_REMOVED (which simply looks for a
null hw_addr) nearly as much.
Signed-off-by: Jarod Wilson <jarod@redhat.com>
Acked-by: Alexander Duyck <aduyck@mirantis.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Diffstat (limited to 'drivers/net/ethernet/intel/igb/e1000_regs.h')
| -rw-r--r-- | drivers/net/ethernet/intel/igb/e1000_regs.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/ethernet/intel/igb/e1000_regs.h b/drivers/net/ethernet/intel/igb/e1000_regs.h index 0fdcd4d1b982..21d9d02885cb 100644 --- a/drivers/net/ethernet/intel/igb/e1000_regs.h +++ b/drivers/net/ethernet/intel/igb/e1000_regs.h @@ -386,8 +386,7 @@ do { \ #define array_wr32(reg, offset, value) \ wr32((reg) + ((offset) << 2), (value)) -#define array_rd32(reg, offset) \ - (readl(hw->hw_addr + reg + ((offset) << 2))) +#define array_rd32(reg, offset) (igb_rd32(hw, reg + ((offset) << 2))) /* DMA Coalescing registers */ #define E1000_PCIEMISC 0x05BB8 /* PCIE misc config register */ |