mirror of
https://git.notmuchmail.org/git/notmuch
synced 2024-12-23 01:44:52 +01:00
82 lines
3.1 KiB
Text
82 lines
3.1 KiB
Text
|
From: Joe Perches <joe@perches.com>
|
||
|
|
Subject: [PATCH 12/44] drivers/net/bnx2x: Remove unnecessary semicolons
|
||
|
|
Date: Sun, 14 Nov 2010 19:04:31 -0800
|
||
|
|
Lines: 44
|
||
|
|
Message-ID: <2bfaf1f1fe5d503a8a386a433b5187997819d771.1289789604.git.joe@perches.com>
|
||
|
|
References: <cover.1289789604.git.joe@perches.com>
|
||
|
|
Cc: Eilon Greenstein <eilong@broadcom.com>, netdev@vger.kernel.org,
|
||
|
|
linux-kernel@vger.kernel.org
|
||
|
|
To: Jiri Kosina <trivial@kernel.org>
|
||
|
|
X-From: linux-kernel-owner@vger.kernel.org Mon Nov 15 04:13:27 2010
|
||
|
|
Return-path: <linux-kernel-owner@vger.kernel.org>
|
||
|
|
Envelope-to: glk-linux-kernel-3@lo.gmane.org
|
||
|
|
Received: from vger.kernel.org ([209.132.180.67])
|
||
|
|
by lo.gmane.org with esmtp (Exim 4.69)
|
||
|
|
(envelope-from <linux-kernel-owner@vger.kernel.org>)
|
||
|
|
id 1PHpVW-00042L-1L
|
||
|
|
for glk-linux-kernel-3@lo.gmane.org; Mon, 15 Nov 2010 04:13:26 +0100
|
||
|
|
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
|
||
|
|
id S932754Ab0KODMy (ORCPT <rfc822;glk-linux-kernel-3@m.gmane.org>);
|
||
|
|
Sun, 14 Nov 2010 22:12:54 -0500
|
||
|
|
Received: from mail.perches.com ([173.55.12.10]:1156 "EHLO mail.perches.com"
|
||
|
|
rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
|
||
|
|
id S932660Ab0KODFf (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
|
||
|
|
Sun, 14 Nov 2010 22:05:35 -0500
|
||
|
|
Received: from Joe-Laptop.home (unknown [192.168.1.162])
|
||
|
|
by mail.perches.com (Postfix) with ESMTP id AB58824375;
|
||
|
|
Sun, 14 Nov 2010 19:04:02 -0800 (PST)
|
||
|
|
X-Mailer: git-send-email 1.7.3.1.g432b3.dirty
|
||
|
|
In-Reply-To: <cover.1289789604.git.joe@perches.com>
|
||
|
|
Sender: linux-kernel-owner@vger.kernel.org
|
||
|
|
Precedence: bulk
|
||
|
|
List-ID: <linux-kernel.vger.kernel.org>
|
||
|
|
X-Mailing-List: linux-kernel@vger.kernel.org
|
||
|
|
Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1062309>
|
||
|
|
|
||
|
|
Signed-off-by: Joe Perches <joe@perches.com>
|
||
|
|
---
|
||
|
|
drivers/net/bnx2x/bnx2x_link.c | 4 ++--
|
||
|
|
drivers/net/bnx2x/bnx2x_main.c | 2 +-
|
||
|
|
2 files changed, 3 insertions(+), 3 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/drivers/net/bnx2x/bnx2x_link.c b/drivers/net/bnx2x/bnx2x_link.c
|
||
|
|
index 5809196..38aeffe 100644
|
||
|
|
--- a/drivers/net/bnx2x/bnx2x_link.c
|
||
|
|
+++ b/drivers/net/bnx2x/bnx2x_link.c
|
||
|
|
@@ -3904,7 +3904,7 @@ static u8 bnx2x_8726_read_sfp_module_eeprom(struct bnx2x_phy *phy,
|
||
|
|
MDIO_PMA_REG_SFP_TWO_WIRE_CTRL, &val);
|
||
|
|
if ((val & MDIO_PMA_REG_SFP_TWO_WIRE_CTRL_STATUS_MASK) ==
|
||
|
|
MDIO_PMA_REG_SFP_TWO_WIRE_STATUS_IDLE)
|
||
|
|
- return 0;;
|
||
|
|
+ return 0;
|
||
|
|
msleep(1);
|
||
|
|
}
|
||
|
|
return -EINVAL;
|
||
|
|
@@ -3988,7 +3988,7 @@ static u8 bnx2x_8727_read_sfp_module_eeprom(struct bnx2x_phy *phy,
|
||
|
|
MDIO_PMA_REG_SFP_TWO_WIRE_CTRL, &val);
|
||
|
|
if ((val & MDIO_PMA_REG_SFP_TWO_WIRE_CTRL_STATUS_MASK) ==
|
||
|
|
MDIO_PMA_REG_SFP_TWO_WIRE_STATUS_IDLE)
|
||
|
|
- return 0;;
|
||
|
|
+ return 0;
|
||
|
|
msleep(1);
|
||
|
|
}
|
||
|
|
|
||
|
|
diff --git a/drivers/net/bnx2x/bnx2x_main.c b/drivers/net/bnx2x/bnx2x_main.c
|
||
|
|
index e9ad16f..7ffcb08 100644
|
||
|
|
--- a/drivers/net/bnx2x/bnx2x_main.c
|
||
|
|
+++ b/drivers/net/bnx2x/bnx2x_main.c
|
||
|
|
@@ -8078,7 +8078,7 @@ static void __devinit bnx2x_get_port_hwinfo(struct bnx2x *bp)
|
||
|
|
int port = BP_PORT(bp);
|
||
|
|
u32 val, val2;
|
||
|
|
u32 config;
|
||
|
|
- u32 ext_phy_type, ext_phy_config;;
|
||
|
|
+ u32 ext_phy_type, ext_phy_config;
|
||
|
|
|
||
|
|
bp->link_params.bp = bp;
|
||
|
|
bp->link_params.port = port;
|
||
|
|
--
|
||
|
|
1.7.3.1.g432b3.dirty
|
||
|
|
|
||
|
|
|
||
|
|
|