From patchwork Wed Mar 30 14:06:36 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aaron Conole X-Patchwork-Id: 11814 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id 57B8B2BD7; Wed, 30 Mar 2016 16:06:40 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id C5BF22BA1 for ; Wed, 30 Mar 2016 16:06:38 +0200 (CEST) Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (Postfix) with ESMTPS id 4ACE27D0EF; Wed, 30 Mar 2016 14:06:38 +0000 (UTC) Received: from aconole-fed23 (dhcp-25-15.bos.redhat.com [10.18.25.15]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u2UE6a7c001928 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Wed, 30 Mar 2016 10:06:37 -0400 From: Aaron Conole To: Thomas Monjalon Cc: Panu Matilainen , "Lu\, Wenzhuo" , dev@dpdk.org, "Richardson\, Bruce" References: <1458682638-28378-1-git-send-email-aconole@redhat.com> <6A0DE07E22DDAD4C9103DF62FEBC09090343E973@shsmsx102.ccr.corp.intel.com> <56F38F26.1030707@redhat.com> <2113478.WYverkV2By@xps13> Date: Wed, 30 Mar 2016 10:06:36 -0400 In-Reply-To: <2113478.WYverkV2By@xps13> (Thomas Monjalon's message of "Wed, 30 Mar 2016 12:51:07 +0200") Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.1.50 (gnu/linux) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 Subject: [dpdk-dev] [PATCH v3 2/7] drivers/net/e1000: Suppress misleading indentation warning X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" The register read/write mphy functions have misleading whitespace around the `locked` check. This cleanup merely preserves the existing functionality and suppresses future gcc versions' "misleading indentation" warning. Suggested-by: Panu Matilainen Signed-off-by: Aaron Conole Acked-by: Wenzhuo Lu --- v2: * Changed from "whitespace-only" fix to a functional change moving the phy writes into protection of the `if (locked)` code * Added "Fixes" line. v3: * Instead of changing the code, change to suppress the compiler warning when using gcc6+. This was tested with both gcc6 and gcc5 using gnu make 4.0 and gnu bash 4.3.42 on a fedora 23 system. drivers/net/e1000/Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/net/e1000/Makefile b/drivers/net/e1000/Makefile index ccd2b7b..f4879e6 100644 --- a/drivers/net/e1000/Makefile +++ b/drivers/net/e1000/Makefile @@ -54,6 +54,9 @@ else # CFLAGS_BASE_DRIVER = -Wno-uninitialized -Wno-unused-parameter CFLAGS_BASE_DRIVER += -Wno-unused-variable +ifeq ($(shell test $(GCC_VERSION) -ge 60 && echo 1), 1) +CFLAGS_BASE_DRIVER += -Wno-misleading-indentation +endif endif #