From patchwork Thu Aug 21 15:02:32 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Einon X-Patchwork-Id: 381977 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 5D7EC140096 for ; Fri, 22 Aug 2014 01:03:01 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752673AbaHUPCp (ORCPT ); Thu, 21 Aug 2014 11:02:45 -0400 Received: from mail-wg0-f52.google.com ([74.125.82.52]:60420 "EHLO mail-wg0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752121AbaHUPCo (ORCPT ); Thu, 21 Aug 2014 11:02:44 -0400 Received: by mail-wg0-f52.google.com with SMTP id a1so9140354wgh.11 for ; Thu, 21 Aug 2014 08:02:42 -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; bh=gs5LpWMkVOFka7/ghuzFHjbM5YR2DzYP+6zX4kCO9J8=; b=Jsdcv91K6CajGnUekDWFV3zsV6rIi4Eur8zZ0FD80CxCDLLLsh2G3KNWYWmSrVHkSH 2SK5gB4FSwNRXKRoD+jOLaKkbzbc7mWCID5cnToBuLmhDCs53+sGjqUB+IkY7XwqutBp uO6WfWOiWWmyJaHASUqBkJ9iSqvmIMyz8sgH/F6L25tC0onVcFmiSuc79+OPo3MZlSuM SDlqdBEwAOQnPM+qnXARJ6/chfa1eEiqr3o3in7hjpv2h02FNHDur/ZIytyvuJfHNqeG vSnUHsnI8rFtXmdxB2cux/t7r51Be5VHgnODZStCcfF53UFUtUxnDZ9bzntpS370s0bP flaA== X-Received: by 10.194.203.105 with SMTP id kp9mr69377613wjc.41.1408633362741; Thu, 21 Aug 2014 08:02:42 -0700 (PDT) Received: from msilap.einon.net ([80.229.23.162]) by mx.google.com with ESMTPSA id gl4sm20788674wib.19.2014.08.21.08.02.40 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 21 Aug 2014 08:02:40 -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 v2] staging: et131x: Remove unnecessary i2c_wack variable Date: Thu, 21 Aug 2014 16:02:32 +0100 Message-Id: <1408633352-23310-1-git-send-email-mark.einon@gmail.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1408572883-9235-6-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 --- Modified to remove function parameter indenting changes, which are largely unrelated. drivers/staging/et131x/et131x.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/staging/et131x/et131x.c b/drivers/staging/et131x/et131x.c index fc18e8d..245e048 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,7 +653,7 @@ 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)) writeok = 0;