From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mail-pa0-x242.google.com ([2607:f8b0:400e:c03::242]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1aL0sq-0004z2-Nt for barebox@lists.infradead.org; Mon, 18 Jan 2016 03:53:40 +0000 Received: by mail-pa0-x242.google.com with SMTP id pv5so33075532pac.0 for ; Sun, 17 Jan 2016 19:53:20 -0800 (PST) From: Andrey Smirnov Date: Sun, 17 Jan 2016 19:52:35 -0800 Message-Id: <1453089161-6697-14-git-send-email-andrew.smirnov@gmail.com> In-Reply-To: <1453089161-6697-1-git-send-email-andrew.smirnov@gmail.com> References: <1453089161-6697-1-git-send-email-andrew.smirnov@gmail.com> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "barebox" Errors-To: barebox-bounces+u.kleine-koenig=pengutronix.de@lists.infradead.org Subject: [PATCH 14/20] e1000: Remove unnecessary intialization To: barebox@lists.infradead.org Cc: Andrey Smirnov We always call e1000_init_eeprom_params() as a part of probing, so there's no need check if it needs to be called in e1000_read_eeprom(). Signed-off-by: Andrey Smirnov --- drivers/net/e1000/eeprom.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/drivers/net/e1000/eeprom.c b/drivers/net/e1000/eeprom.c index 4a1c7e6..1f26a87 100644 --- a/drivers/net/e1000/eeprom.c +++ b/drivers/net/e1000/eeprom.c @@ -564,10 +564,6 @@ int32_t e1000_read_eeprom(struct e1000_hw *hw, uint16_t offset, DEBUGFUNC(); - /* If eeprom is not yet detected, do so now */ - if (eeprom->word_size == 0) - e1000_init_eeprom_params(hw); - /* A check for invalid values: offset too large, too many words, * and not enough words. */ -- 2.5.0 _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox