summaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorAndrey Smirnov <andrew.smirnov@gmail.com>2016-06-01 21:58:39 -0700
committerSascha Hauer <s.hauer@pengutronix.de>2016-06-03 09:14:14 +0200
commitb1418147659db3c51db7f74348a7e2361f373303 (patch)
tree7793221868ad24d9d6bc480963b8ffc9f765b57e /drivers/net
parent920fc710948b472ffa6f001663031bb0315d9e6a (diff)
downloadbarebox-b1418147659db3c51db7f74348a7e2361f373303.tar.gz
barebox-b1418147659db3c51db7f74348a7e2361f373303.tar.xz
e1000: Remove 'page_size'
Remove 'page_size' from 'struct e1000_eeprom_info' since it is not used anywhere in the code. Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/e1000/e1000.h1
-rw-r--r--drivers/net/e1000/eeprom.c32
2 files changed, 11 insertions, 22 deletions
diff --git a/drivers/net/e1000/e1000.h b/drivers/net/e1000/e1000.h
index 585e3ff77a..98954d9283 100644
--- a/drivers/net/e1000/e1000.h
+++ b/drivers/net/e1000/e1000.h
@@ -693,7 +693,6 @@ struct e1000_eeprom_info {
uint16_t opcode_bits;
uint16_t address_bits;
uint16_t delay_usec;
- uint16_t page_size;
bool use_eerd;
};
diff --git a/drivers/net/e1000/eeprom.c b/drivers/net/e1000/eeprom.c
index b6414b21e2..e4ef5f9c95 100644
--- a/drivers/net/e1000/eeprom.c
+++ b/drivers/net/e1000/eeprom.c
@@ -315,13 +315,10 @@ int32_t e1000_init_eeprom_params(struct e1000_hw *hw)
eeprom->type = e1000_eeprom_spi;
eeprom->opcode_bits = 8;
eeprom->delay_usec = 1;
- if (eecd & E1000_EECD_ADDR_BITS) {
- eeprom->page_size = 32;
+ if (eecd & E1000_EECD_ADDR_BITS)
eeprom->address_bits = 16;
- } else {
- eeprom->page_size = 8;
+ else
eeprom->address_bits = 8;
- }
} else {
eeprom->type = e1000_eeprom_microwire;
eeprom->opcode_bits = 3;
@@ -341,13 +338,11 @@ int32_t e1000_init_eeprom_params(struct e1000_hw *hw)
eeprom->type = e1000_eeprom_spi;
eeprom->opcode_bits = 8;
eeprom->delay_usec = 1;
- if (eecd & E1000_EECD_ADDR_BITS) {
- eeprom->page_size = 32;
+ if (eecd & E1000_EECD_ADDR_BITS)
eeprom->address_bits = 16;
- } else {
- eeprom->page_size = 8;
+ else
eeprom->address_bits = 8;
- }
+
eeprom->use_eerd = false;
break;
case e1000_82573:
@@ -355,13 +350,11 @@ int32_t e1000_init_eeprom_params(struct e1000_hw *hw)
eeprom->type = e1000_eeprom_spi;
eeprom->opcode_bits = 8;
eeprom->delay_usec = 1;
- if (eecd & E1000_EECD_ADDR_BITS) {
- eeprom->page_size = 32;
+ if (eecd & E1000_EECD_ADDR_BITS)
eeprom->address_bits = 16;
- } else {
- eeprom->page_size = 8;
+ else
eeprom->address_bits = 8;
- }
+
if (e1000_is_onboard_nvm_eeprom(hw) == false) {
eeprom->use_eerd = true;
@@ -378,13 +371,11 @@ int32_t e1000_init_eeprom_params(struct e1000_hw *hw)
eeprom->type = e1000_eeprom_spi;
eeprom->opcode_bits = 8;
eeprom->delay_usec = 1;
- if (eecd & E1000_EECD_ADDR_BITS) {
- eeprom->page_size = 32;
+ if (eecd & E1000_EECD_ADDR_BITS)
eeprom->address_bits = 16;
- } else {
- eeprom->page_size = 8;
+ else
eeprom->address_bits = 8;
- }
+
eeprom->use_eerd = true;
break;
case e1000_igb:
@@ -392,7 +383,6 @@ int32_t e1000_init_eeprom_params(struct e1000_hw *hw)
eeprom->type = e1000_eeprom_invm;
eeprom->opcode_bits = 8;
eeprom->delay_usec = 1;
- eeprom->page_size = 32;
eeprom->address_bits = 16;
eeprom->use_eerd = true;
break;