From mboxrd@z Thu Jan  1 00:00:00 1970
From: Aaron Conole <aconole@redhat.com>
Subject: [PATCH v3 2/7] drivers/net/e1000: Suppress misleading
	indentation warning
Date: Wed, 30 Mar 2016 10:06:36 -0400
Message-ID: <f7t60w412mr.fsf_-_@redhat.com>
References: <1458682638-28378-1-git-send-email-aconole@redhat.com>
 <6A0DE07E22DDAD4C9103DF62FEBC09090343E973@shsmsx102.ccr.corp.intel.com>
 <56F38F26.1030707@redhat.com> <2113478.WYverkV2By@xps13>
Mime-Version: 1.0
Content-Type: text/plain
Cc: Panu Matilainen <pmatilai@redhat.com>,
 "Lu\, Wenzhuo" <wenzhuo.lu@intel.com>, dev@dpdk.org,
 "Richardson\, Bruce" <bruce.richardson@intel.com>
To: Thomas Monjalon <thomas.monjalon@6wind.com>
Return-path: <dev-bounces@dpdk.org>
Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28])
 by dpdk.org (Postfix) with ESMTP id C5BF22BA1
 for <dev@dpdk.org>; Wed, 30 Mar 2016 16:06:38 +0200 (CEST)
In-Reply-To: <2113478.WYverkV2By@xps13> (Thomas Monjalon's message of "Wed, 30
 Mar 2016 12:51:07 +0200")
List-Id: patches and discussions about DPDK <dev.dpdk.org>
List-Unsubscribe: <http://dpdk.org/ml/options/dev>,
 <mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://dpdk.org/ml/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <http://dpdk.org/ml/listinfo/dev>,
 <mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org
Sender: "dev" <dev-bounces@dpdk.org>

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 <pmatilai@redhat.com>
Signed-off-by: Aaron Conole <aconole@redhat.com>
---
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
 
 #
-- 
2.5.5