All of lore.kernel.org
 help / color / mirror / Atom feed
From: Bin Meng <bmeng.cn@gmail.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH 2/3] net: e1000: Remove CONFIG_MVBC_1G
Date: Mon, 16 Nov 2015 01:19:17 -0800	[thread overview]
Message-ID: <1447665558-21632-2-git-send-email-bmeng.cn@gmail.com> (raw)
In-Reply-To: <1447665558-21632-1-git-send-email-bmeng.cn@gmail.com>

CONFIG_MVBC_1G is not referenced anywhere, hence remove it.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
---

 drivers/net/e1000.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/drivers/net/e1000.c b/drivers/net/e1000.c
index 508ebfb..6be2d9f 100644
--- a/drivers/net/e1000.c
+++ b/drivers/net/e1000.c
@@ -5286,7 +5286,6 @@ static int e1000_init_one(struct e1000_hw *hw, int cardnum, pci_dev_t devno,
 
 #ifndef CONFIG_E1000_NO_NVM
 	/* Validate the EEPROM and get chipset information */
-#if !defined(CONFIG_MVBC_1G)
 	if (e1000_init_eeprom_params(hw)) {
 		E1000_ERR(hw, "EEPROM is invalid!\n");
 		return -EINVAL;
@@ -5294,7 +5293,6 @@ static int e1000_init_one(struct e1000_hw *hw, int cardnum, pci_dev_t devno,
 	if ((E1000_READ_REG(hw, I210_EECD) & E1000_EECD_FLUPD) &&
 	    e1000_validate_eeprom_checksum(hw))
 		return -ENXIO;
-#endif
 	e1000_read_mac_addr(hw, enetaddr);
 #endif
 	e1000_get_bus_type(hw);
-- 
1.8.2.1

  reply	other threads:[~2015-11-16  9:19 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-11-16  9:19 [U-Boot] [PATCH 1/3] net: e1000: Remove dead codes wrapped by #if 0 Bin Meng
2015-11-16  9:19 ` Bin Meng [this message]
2015-11-20 22:19   ` [U-Boot] [PATCH 2/3] net: e1000: Remove CONFIG_MVBC_1G Joe Hershberger
2015-12-22 18:00   ` Joe Hershberger
2015-11-16  9:19 ` [U-Boot] [PATCH 3/3] net: e1000: Mark _disable_wr() and _write_status() as __maybe_unused Bin Meng
2015-11-20 22:19   ` Joe Hershberger
2015-12-22 18:01   ` Joe Hershberger
2015-11-20 22:19 ` [U-Boot] [PATCH 1/3] net: e1000: Remove dead codes wrapped by #if 0 Joe Hershberger
2015-12-22 18:00 ` Joe Hershberger

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=1447665558-21632-2-git-send-email-bmeng.cn@gmail.com \
    --to=bmeng.cn@gmail.com \
    --cc=u-boot@lists.denx.de \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.