diff options
| author | Andrey Smirnov <andrew.smirnov@gmail.com> | 2016-06-01 21:58:37 -0700 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2016-06-03 09:14:14 +0200 |
| commit | ff6a64d42ffc8cb9bb3ccfd0687633a6565d494d (patch) | |
| tree | 9f55593a4a4930454c1076abfee257514311cd45 /drivers/net/e1000/eeprom.c | |
| parent | 7477a1500a54483690e37dec3826119768f2b779 (diff) | |
| download | barebox-ff6a64d42ffc8cb9bb3ccfd0687633a6565d494d.tar.gz barebox-ff6a64d42ffc8cb9bb3ccfd0687633a6565d494d.tar.xz | |
e1000: Consolidate register offset fixups
Consolidate all code taking care on CSR offset differences for i210
chips into a single place in the driver and integrate that funcionality
into e1000_{read,write}_reg functions. This way we can get rid of all
those
if (hw->mac_type == e1000_igb) {
....
} else {
....
}
snippets sprinkled all across the driver code.
Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers/net/e1000/eeprom.c')
| -rw-r--r-- | drivers/net/e1000/eeprom.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/drivers/net/e1000/eeprom.c b/drivers/net/e1000/eeprom.c index 497fb7b3f1..c2dfad5f2e 100644 --- a/drivers/net/e1000/eeprom.c +++ b/drivers/net/e1000/eeprom.c @@ -451,14 +451,10 @@ static int32_t e1000_poll_eerd_eewr_done(struct e1000_hw *hw, int eerd) int32_t done = E1000_ERR_EEPROM; for (i = 0; i < attempts; i++) { - if (eerd == E1000_EEPROM_POLL_READ) { + if (eerd == E1000_EEPROM_POLL_READ) reg = e1000_read_reg(hw, E1000_EERD); - } else { - if (hw->mac_type == e1000_igb) - reg = e1000_read_reg(hw, E1000_I210_EEWR); - else - reg = e1000_read_reg(hw, E1000_EEWR); - } + else + reg = e1000_read_reg(hw, E1000_EEWR); if (reg & E1000_EEPROM_RW_REG_DONE) { done = E1000_SUCCESS; |