diff options
Diffstat (limited to 'drivers/net/e1000/eeprom.c')
| -rw-r--r-- | drivers/net/e1000/eeprom.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/drivers/net/e1000/eeprom.c b/drivers/net/e1000/eeprom.c index 6bdf9db553..effe0c6cff 100644 --- a/drivers/net/e1000/eeprom.c +++ b/drivers/net/e1000/eeprom.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-only #include <common.h> #include <init.h> #include <malloc.h> @@ -409,8 +410,7 @@ static void e1000_eeprom_uses_microwire(struct e1000_eeprom_info *eeprom, static size_t e1000_igb_get_flash_size(struct e1000_hw *hw) { - struct device_node *node = - hw->pdev->dev.device_node; + struct device_node *node = hw->pdev->dev.of_node; u32 flash_size; uint32_t fla; int ret = 0; @@ -494,6 +494,7 @@ int32_t e1000_init_eeprom_params(struct e1000_hw *hw) case e1000_82571: case e1000_82572: e1000_eeprom_uses_spi(eeprom, eecd); + eeprom->read = e1000_read_eeprom_eerd; break; case e1000_82573: @@ -501,7 +502,6 @@ int32_t e1000_init_eeprom_params(struct e1000_hw *hw) if (e1000_is_onboard_nvm_eeprom(hw)) { e1000_eeprom_uses_spi(eeprom, eecd); } else { - eeprom->read = e1000_read_eeprom_eerd; eeprom->type = e1000_eeprom_flash; eeprom->word_size = 2048; @@ -512,6 +512,7 @@ int32_t e1000_init_eeprom_params(struct e1000_hw *hw) eecd &= ~E1000_EECD_AUPDEN; e1000_write_reg(hw, E1000_EECD, eecd); } + eeprom->read = e1000_read_eeprom_eerd; break; case e1000_80003es2lan: @@ -799,7 +800,7 @@ int e1000_validate_eeprom_checksum(struct e1000_hw *hw) /* Read the EEPROM */ if (e1000_read_eeprom(hw, 0, EEPROM_CHECKSUM_REG + 1, buf) < 0) { - dev_err(&hw->edev.dev, "Unable to read EEPROM!\n"); + dev_err(hw->dev, "Unable to read EEPROM!\n"); return -E1000_ERR_EEPROM; } @@ -815,8 +816,8 @@ int e1000_validate_eeprom_checksum(struct e1000_hw *hw) return 0; /* Hrm, verification failed, print an error */ - dev_err(&hw->edev.dev, "EEPROM checksum is incorrect!\n"); - dev_err(&hw->edev.dev, " ...register was 0x%04hx, calculated 0x%04hx\n", + dev_err(hw->dev, "EEPROM checksum is incorrect!\n"); + dev_err(hw->dev, " ...register was 0x%04hx, calculated 0x%04hx\n", checksum_reg, checksum); return -E1000_ERR_EEPROM; |