From patchwork Wed Aug 20 22:17:55 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Einon X-Patchwork-Id: 381831 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 7BD5314011D for ; Thu, 21 Aug 2014 08:20:02 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753505AbaHTWTo (ORCPT ); Wed, 20 Aug 2014 18:19:44 -0400 Received: from mail-we0-f181.google.com ([74.125.82.181]:63796 "EHLO mail-we0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753300AbaHTWSQ (ORCPT ); Wed, 20 Aug 2014 18:18:16 -0400 Received: by mail-we0-f181.google.com with SMTP id k48so8414094wev.26 for ; Wed, 20 Aug 2014 15:18:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=lNdCa+5oRqM0J8w8/KUoXPPfEbyylf2VEjZ9ZWBt9FI=; b=HdxE1FpzAivWdoqabSwkkR0eYHlN3nvozBJFWAgno7kpWz6zByHHxPF4nhgENGmJft rniEiMOgIn7Qj2ulwjakatCcl1LQ5lLFN8gmkuIH6r/VfMJqlF+6fX3Evf2x9cFloOhN hbIBiT2uJUt1tvfY9zKQVY1TdT+EwYFlnCzx1a3c5Xv/wyPzXnW+UJqzWdW3IbSTJAvO DVEFrzjvKgQTxGSTs5w+GYbIVqVa2xpnfpQvK+YDTboXwWdSV8Wk83gkEOIS81mjgJRn QLIBQAl3hFJOmevxoA+aOdrYZ1xwwXzQE/NSfV5/YITIFjPK605nzGZvNLMhuTH0bc34 HnIQ== X-Received: by 10.194.200.74 with SMTP id jq10mr29651415wjc.110.1408573095483; Wed, 20 Aug 2014 15:18:15 -0700 (PDT) Received: from msilap.einon.net ([80.229.23.162]) by mx.google.com with ESMTPSA id f3sm13378073wiz.0.2014.08.20.15.18.14 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 20 Aug 2014 15:18:14 -0700 (PDT) From: Mark Einon To: gregkh@linuxfoundation.org Cc: devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org, netdev@vger.kernel.org, Mark Einon Subject: [PATCH 5/8] staging: et131x: Remove unnecessary i2c_wack variable Date: Wed, 20 Aug 2014 23:17:55 +0100 Message-Id: <1408573078-9320-6-git-send-email-mark.einon@gmail.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1408573078-9320-1-git-send-email-mark.einon@gmail.com> References: <1408573078-9320-1-git-send-email-mark.einon@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org i2c_wack is only used to implement a while(1) loop, so let's remove it. Signed-off-by: Mark Einon --- drivers/staging/et131x/et131x.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/drivers/staging/et131x/et131x.c b/drivers/staging/et131x/et131x.c index fc18e8d..551b250 100644 --- a/drivers/staging/et131x/et131x.c +++ b/drivers/staging/et131x/et131x.c @@ -573,7 +573,6 @@ static int eeprom_write(struct et131x_adapter *adapter, u32 addr, u8 data) int index = 0; int retries; int err = 0; - int i2c_wack = 0; int writeok = 0; u32 status; u32 val = 0; @@ -599,8 +598,6 @@ static int eeprom_write(struct et131x_adapter *adapter, u32 addr, u8 data) LBCIF_CONTROL_LBCIF_ENABLE | LBCIF_CONTROL_I2C_WRITE)) return -EIO; - i2c_wack = 1; - /* Prepare EEPROM address for Step 3 */ for (retries = 0; retries < MAX_NUM_WRITE_RETRIES; retries++) { @@ -656,9 +653,9 @@ static int eeprom_write(struct et131x_adapter *adapter, u32 addr, u8 data) */ udelay(10); - while (i2c_wack) { + while (1) { if (pci_write_config_byte(pdev, LBCIF_CONTROL_REGISTER, - LBCIF_CONTROL_LBCIF_ENABLE)) + LBCIF_CONTROL_LBCIF_ENABLE)) writeok = 0; /* Do read until internal ACK_ERROR goes away meaning write @@ -670,7 +667,8 @@ static int eeprom_write(struct et131x_adapter *adapter, u32 addr, u8 data) addr); do { pci_read_config_dword(pdev, - LBCIF_DATA_REGISTER, &val); + LBCIF_DATA_REGISTER, + &val); } while ((val & 0x00010000) == 0); } while (val & 0x00040000);