mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Andrey Smirnov <andrew.smirnov@gmail.com>
To: barebox@lists.infradead.org
Cc: Andrey Smirnov <andrew.smirnov@gmail.com>
Subject: [PATCH 10/21] e1000: Remove 'page_size'
Date: Tue, 31 May 2016 10:09:29 -0700	[thread overview]
Message-ID: <1464714580-31488-11-git-send-email-andrew.smirnov@gmail.com> (raw)
In-Reply-To: <1464714580-31488-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 76872f0..bb5f697 100644
--- a/drivers/net/e1000/e1000.h
+++ b/drivers/net/e1000/e1000.h
@@ -688,7 +688,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 b6414b2..e4ef5f9 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;
-- 
2.5.5


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

  parent reply	other threads:[~2016-05-31 17:10 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-05-31 17:09 [PATCH 00/21] e1000 code cleanup and iNVM support Andrey Smirnov
2016-05-31 17:09 ` [PATCH 01/21] e1000: Split driver into multiple files Andrey Smirnov
2016-05-31 17:09 ` [PATCH 02/21] e1000: Include <net.h> in e1000.h Andrey Smirnov
2016-05-31 17:09 ` [PATCH 03/21] e1000: Convert E1000_*_REG macros to functions Andrey Smirnov
2016-05-31 17:09 ` [PATCH 04/21] e1000: Fix a bug in e1000_detect_gig_phy Andrey Smirnov
2016-05-31 17:09 ` [PATCH 05/21] e1000: Remove unnecessary variable Andrey Smirnov
2016-05-31 17:09 ` [PATCH 06/21] e1000: Do not read same register twice Andrey Smirnov
2016-05-31 17:09 ` [PATCH 07/21] e1000: Remove unneeded i210 specific register code Andrey Smirnov
2016-05-31 17:09 ` [PATCH 08/21] e1000: Consolidate register offset fixups Andrey Smirnov
2016-05-31 20:42   ` Trent Piepho
2016-06-01 21:35     ` Andrey Smirnov
2016-05-31 17:09 ` [PATCH 09/21] e1000: Remove 'use_eewr' parameter Andrey Smirnov
2016-05-31 17:09 ` Andrey Smirnov [this message]
2016-05-31 17:09 ` [PATCH 11/21] e1000: Simplify EEPROM init for e1000_80003es2lan Andrey Smirnov
2016-05-31 17:09 ` [PATCH 12/21] e1000: Simplify EEPROM init for e1000_igb Andrey Smirnov
2016-05-31 17:09 ` [PATCH 13/21] e1000: Consolidate SPI EEPROM init code Andrey Smirnov
2016-05-31 17:09 ` [PATCH 14/21] e1000: Consolidate Microwire " Andrey Smirnov
2016-05-31 17:09 ` [PATCH 15/21] e1000: Fix a bug in e1000_probe() Andrey Smirnov
2016-05-31 17:09 ` [PATCH 16/21] e1000: Remove unnecessary intialization Andrey Smirnov
2016-05-31 17:09 ` [PATCH 17/21] e1000: Refactor Flash/EEPROM reading code Andrey Smirnov
2016-05-31 17:09 ` [PATCH 18/21] e1000: Properly release SW_FW_SYNC semaphore bits Andrey Smirnov
2016-05-31 17:09 ` [PATCH 19/21] e1000: Add EEPROM access locking for i210 Andrey Smirnov
2016-05-31 17:09 ` [PATCH 20/21] e1000: Add a "poll register" function Andrey Smirnov
2016-05-31 17:09 ` [PATCH 21/21] 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=1464714580-31488-11-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