From: Andrey Smirnov <andrew.smirnov@gmail.com>
To: barebox@lists.infradead.org
Cc: Andrey Smirnov <andrew.smirnov@gmail.com>
Subject: [PATCH 08/20] e1000: Remove 'page_size'
Date: Sun, 17 Jan 2016 19:52:29 -0800 [thread overview]
Message-ID: <1453089161-6697-8-git-send-email-andrew.smirnov@gmail.com> (raw)
In-Reply-To: <1453089161-6697-1-git-send-email-andrew.smirnov@gmail.com>
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>
---
drivers/net/e1000/e1000.h | 1 -
drivers/net/e1000/eeprom.c | 32 +++++++++++---------------------
2 files changed, 11 insertions(+), 22 deletions(-)
diff --git a/drivers/net/e1000/e1000.h b/drivers/net/e1000/e1000.h
index 97fe52f..8ec45a7 100644
--- a/drivers/net/e1000/e1000.h
+++ b/drivers/net/e1000/e1000.h
@@ -699,7 +699,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 7b4c77d..0cd0bf5 100644
--- a/drivers/net/e1000/eeprom.c
+++ b/drivers/net/e1000/eeprom.c
@@ -316,13 +316,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;
@@ -342,13 +339,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:
@@ -356,13 +351,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;
@@ -379,13 +372,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:
@@ -393,7 +384,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;
--
2.5.0
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next prev parent reply other threads:[~2016-01-18 3:53 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <1453089161-6697-1-git-send-email-andrew.smirnov@gmail.com>
2016-01-18 3:52 ` [PATCH 02/20] e1000: Fix a bug in e1000_detect_gig_phy Andrey Smirnov
2016-01-18 3:52 ` [PATCH 03/20] e1000: Remove unnecessary variable Andrey Smirnov
2016-01-18 3:52 ` [PATCH 04/20] e1000: Do not read same register twice Andrey Smirnov
2016-01-18 3:52 ` [PATCH 05/20] e1000: Remove unneeded i210 specific register code Andrey Smirnov
2016-01-18 3:52 ` [PATCH 06/20] e1000: Consolidate register offset fixups Andrey Smirnov
2016-01-18 3:52 ` [PATCH 07/20] e1000: Remove 'use_eewr' parameter Andrey Smirnov
2016-01-18 3:52 ` Andrey Smirnov [this message]
2016-01-18 3:52 ` [PATCH 09/20] e1000: Simplify EEPROM init for e1000_80003es2lan Andrey Smirnov
2016-01-18 3:52 ` [PATCH 10/20] e1000: Simplify EEPROM init for e1000_igb Andrey Smirnov
2016-01-18 3:52 ` [PATCH 11/20] e1000: Consolidate SPI EEPROM init code Andrey Smirnov
2016-01-18 3:52 ` [PATCH 12/20] e1000: Consolidate Microwire " Andrey Smirnov
2016-01-18 3:52 ` [PATCH 13/20] e1000: Fix a bug in e1000_probe() Andrey Smirnov
2016-01-18 3:52 ` [PATCH 14/20] e1000: Remove unnecessary intialization Andrey Smirnov
2016-01-18 3:52 ` [PATCH 15/20] e1000: Refactor Flash/EEPROM reading code Andrey Smirnov
2016-01-18 3:52 ` [PATCH 16/20] e1000: Add functions for register polling Andrey Smirnov
2016-01-19 8:21 ` Sascha Hauer
2016-01-19 18:53 ` Andrey Smirnov
2016-01-20 7:32 ` Sascha Hauer
2016-01-18 3:52 ` [PATCH 17/20] e1000: Properly release SW_FW_SYNC semaphore bits Andrey Smirnov
2016-01-18 3:52 ` [PATCH 18/20] e1000: Add EEPROM access locking for i210 Andrey Smirnov
2016-01-18 3:52 ` [PATCH 19/20] e1000: Expose i210's external flash as MTD Andrey Smirnov
2016-01-18 3:52 ` [PATCH 20/20] e1000: Expose i210's iNVM as a cdev Andrey Smirnov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1453089161-6697-8-git-send-email-andrew.smirnov@gmail.com \
--to=andrew.smirnov@gmail.com \
--cc=barebox@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox