diff options
| author | Igor Russkikh <igor.russkikh@aquantia.com> | 2018-01-19 15:03:23 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-01-22 00:19:03 +0100 |
| commit | 76c19c6cfa8f7e4f8c7d5407f77237b80095e5d9 (patch) | |
| tree | a44ea8aa2b187f809d44f1a2f2ce7c3e0a128e00 /drivers/net/ethernet/aquantia/atlantic/aq_hw_utils.c | |
| parent | net: aquantia: Remove create/destroy from hw ops (diff) | |
| download | linux-76c19c6cfa8f7e4f8c7d5407f77237b80095e5d9.tar.xz linux-76c19c6cfa8f7e4f8c7d5407f77237b80095e5d9.zip | |
net: aquantia: Change confusing no_ff_addr to more meaningful name
The address to check if HW is not dead/hang could be stored in
capabilities, since it is a constant. Change its name to better reflect
the idea.
Signed-off-by: Igor Russkikh <igor.russkikh@aquantia.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/aquantia/atlantic/aq_hw_utils.c')
| -rw-r--r-- | drivers/net/ethernet/aquantia/atlantic/aq_hw_utils.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_hw_utils.c b/drivers/net/ethernet/aquantia/atlantic/aq_hw_utils.c index 27e250d61da7..d526c4f19d34 100644 --- a/drivers/net/ethernet/aquantia/atlantic/aq_hw_utils.c +++ b/drivers/net/ethernet/aquantia/atlantic/aq_hw_utils.c @@ -13,6 +13,7 @@ #include "aq_hw_utils.h" #include "aq_hw.h" +#include "aq_nic.h" void aq_hw_write_reg_bit(struct aq_hw_s *aq_hw, u32 addr, u32 msk, u32 shift, u32 val) @@ -39,7 +40,9 @@ u32 aq_hw_read_reg(struct aq_hw_s *hw, u32 reg) { u32 value = readl(hw->mmio + reg); - if ((~0U) == value && (~0U) == readl(hw->mmio + hw->not_ff_addr)) + if ((~0U) == value && + (~0U) == readl(hw->mmio + + hw->aq_nic_cfg->aq_hw_caps->hw_alive_check_addr)) aq_utils_obj_set(&hw->flags, AQ_HW_FLAG_ERR_UNPLUG); return value; |