From patchwork Mon Jun 23 00:35:01 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vince Bridgers X-Patchwork-Id: 362625 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 45D4814008D for ; Mon, 23 Jun 2014 10:39:15 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751215AbaFWAjJ (ORCPT ); Sun, 22 Jun 2014 20:39:09 -0400 Received: from mail-ig0-f176.google.com ([209.85.213.176]:42382 "EHLO mail-ig0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750936AbaFWAjD (ORCPT ); Sun, 22 Jun 2014 20:39:03 -0400 Received: by mail-ig0-f176.google.com with SMTP id c1so2372363igq.15 for ; Sun, 22 Jun 2014 17:39:01 -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=cRX4WNnks3B1mVKuB716wQNro+ZcJw8HMwJO46s0cEs=; b=052OVXQSFWKgyxUtRyj6u31d5231FgR5Okr2UQ5sKK+YdIu+1G+wH5ulwxxrdEum1s Zy1o246+riC9Fbdkef2G6SBYY6H5YlcDgjbPrqBGg5l6ZjScrV/D0EMniekJauOybANo qJY6WBbIY+bcybbsIkHcVGX3qiDF4s1Zvchr0FprLta03RD0fcP+/EAqVe0VdeGyVC19 brqPGfuvUjCSD93VgRerYSY0nv3ZL0v9scNHRhht95bugOPuEEEFYw6khvo2l1M7+UAA iV0qxyUUubEfCcRpWCmbDRdvkp1uKxW4qkt3DXG7NiPTH1/f9TD2vtjtFs8xOdie/4yO 5JeQ== X-Received: by 10.42.148.67 with SMTP id q3mr19091770icv.5.1403483941654; Sun, 22 Jun 2014 17:39:01 -0700 (PDT) Received: from vince-Latitude-E6320.gateway.2wire.net (99-61-67-66.lightspeed.austtx.sbcglobal.net. [99.61.67.66]) by mx.google.com with ESMTPSA id cu7sm60337169oec.12.2014.06.22.17.39.00 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 22 Jun 2014 17:39:00 -0700 (PDT) From: Vince Bridgers To: netdev@vger.kernel.org, peppe.cavallaro@st.com Cc: vbridgers2013@gmail.com Subject: [PATCH net 2/2] net: stmmac: Correct duplicate if/then/else case found by cppcheck Date: Sun, 22 Jun 2014 19:35:01 -0500 Message-Id: <1403483701-21199-3-git-send-email-vbridgers2013@gmail.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1403483701-21199-1-git-send-email-vbridgers2013@gmail.com> References: <1403483701-21199-1-git-send-email-vbridgers2013@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Cppcheck found a duplicate if/then/else case where a receive descriptor was being processed. This patch corrects that issue. cppcheck --force --enable=all --inline-suppr . ... Checking enh_desc.c... [enh_desc.c:148] -> [enh_desc.c:144]: (style) Found duplicate if expressions. ... Signed-off-by: Vince Bridgers --- drivers/net/ethernet/stmicro/stmmac/enh_desc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/enh_desc.c b/drivers/net/ethernet/stmicro/stmmac/enh_desc.c index 7e6628a..1e2bcf5 100644 --- a/drivers/net/ethernet/stmicro/stmmac/enh_desc.c +++ b/drivers/net/ethernet/stmicro/stmmac/enh_desc.c @@ -145,7 +145,7 @@ static void enh_desc_get_ext_status(void *data, struct stmmac_extra_stats *x, x->rx_msg_type_delay_req++; else if (p->des4.erx.msg_type == RDES_EXT_DELAY_RESP) x->rx_msg_type_delay_resp++; - else if (p->des4.erx.msg_type == RDES_EXT_DELAY_REQ) + else if (p->des4.erx.msg_type == RDES_EXT_PDELAY_REQ) x->rx_msg_type_pdelay_req++; else if (p->des4.erx.msg_type == RDES_EXT_PDELAY_RESP) x->rx_msg_type_pdelay_resp++;