From patchwork Fri May 5 19:47:13 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 98721 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp293336qge; Fri, 5 May 2017 12:49:57 -0700 (PDT) X-Received: by 10.98.46.69 with SMTP id u66mr18929694pfu.262.1494013797821; Fri, 05 May 2017 12:49:57 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 1si2689373pgp.198.2017.05.05.12.49.57; Fri, 05 May 2017 12:49:57 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755624AbdEETs4 (ORCPT + 6 others); Fri, 5 May 2017 15:48:56 -0400 Received: from mout.kundenserver.de ([212.227.126.187]:56178 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755754AbdEETsl (ORCPT ); Fri, 5 May 2017 15:48:41 -0400 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue002 [212.227.15.129]) with ESMTPA (Nemesis) id 0M3JVg-1dxJrn2LpY-00qxI5; Fri, 05 May 2017 21:48:27 +0200 From: Arnd Bergmann To: Ben Hutchings Cc: stable@vger.kernel.org, David Malcolm , "David S . Miller" , Arnd Bergmann Subject: [PATCH 3.16-stable 55/87] drivers/net/ethernet/dec/tulip/uli526x.c: fix misleading indentation in uli526x_timer Date: Fri, 5 May 2017 21:47:13 +0200 Message-Id: <20170505194745.3627137-56-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170505194745.3627137-1-arnd@arndb.de> References: <20170505194745.3627137-1-arnd@arndb.de> MIME-Version: 1.0 X-Provags-ID: V03:K0:wzy8kxg1KjUJx7MqAzDDfa+XsM8wZzKkF1UGf1ESGcfMrNBgMLG TjZhlgZUcFrJIDCylOewAtSQywCOwrIuQlRwEfGRStQkzCrqWIL2bCLF556GrQq8qCM+zFj D2hqn7dpNRIMAYtP/ms1+whrI8HjxeH2SKw6JF5v36/J7E0Ys58upIdkEc3UqQKoxfBOVfv rCe/MUCtvZKJNnxWcrffA== X-UI-Out-Filterresults: notjunk:1; V01:K0:WwR4CFTgPxk=:lYyXnJ+KaDKkkwmHcmxh8S 0bohuqHzPcHjXq4fisxZQ5CeiPfqQDqAOv06NlVxAWPTMfM2ZQ89cnowLmnR80YkcqNaCDSbH OkoTbE2v9bQhWH6sJxyatthup4R57PDKEhkBU7nxWACyz/WyI0wCOK8V/ve5N108CrLCw2afj 1/mJxF1Ib7eJFs/4+yeg0xAgBPlo7sU8dSgfOQc1sunzEu2YcT1jjV5Er5+MJ8NGhLREfGYCf qUOK8ZExxzJ7UMILEdgQe/Fo4tds61MJZr+sCk7D3D33uFvv7S4WBalHofCbJQWb4E2C8Pq2D W2UptOBDbmO/huVkUC3gA7OAb2EXqTrM96kfVHfckx6I8L0tOsnb5MOvYUEk3NLL28KvjW6Hf 0GDWi/9P91Xojm6N5YYH+MgPpGwPQUqdxVowWY8LQrZiCTkJcvjpNjhln0F7CUDv4G7ZXHrNr q1LChxgHOLNRUhOEx4qoHYwaWXnAOUV68pwUZEFcGR/6NhsZdYnMBWxJeazD1pu6HFLd08R0F 1M5oTjXd2xM8FKMjyXCVjwEKduk0lqyXvEI47RVXQnravP6cZJaWwFaaN0vdZcJJgdbVmQBCk JZzdoAdH1+CSpPha7ozoZV/VJt3/IytKO+nGMHeF7SAi9MdpXDLsVrDOz9Kx87E1AfHID7G4G KlvaxhBGg+sAeACIRbre25MQrUSHuuvm2EY8xVv2+B1Q2bPH3S/CYzU6J+unYQcOAWt+WOJrU cEkMtoYUPTtdMjJj Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: David Malcolm Commit 862f90c368e4e310def16f5a89edd0e078d7b840 upstream. This code in drivers/net/ethernet/dec/tulip/uli526x.c function "uli526x_timer": 1086 } else 1087 if ((tmp_cr12 & 0x3) && db->link_failed) { [...snip...] 1109 } 1110 else if(!(tmp_cr12 & 0x3) && db->link_failed) 1111 { [...snip...] 1117 } 1118 db->init=0; is misleadingly indented: the db->init=0 is indented as if part of the else clause at line 1086, but it is independent of it (no braces before the "if" at line 1087). This patch fixes the indentation to reflect the actual meaning of the code, though is it actually meant to be part of the "else" clause? (I'm a compiler developer, not a kernel person). It also adds spaces around the assignment, to placate checkpatch.pl. Seen via an experimental new gcc warning I'm working on for gcc 6, -Wmisleading-indentation, using gcc r223098 adding -Werror=misleading-indentation to KBUILD_CFLAGS in Makefile. The experimental GCC emits this warning (as an error), rightly IMHO: drivers/net/ethernet/dec/tulip/uli526x.c: In function ‘uli526x_timer’: drivers/net/ethernet/dec/tulip/uli526x.c:1118:3: error: statement is indented as if it were guarded by... [-Werror=misleading-indentation] db->init=0; ^ drivers/net/ethernet/dec/tulip/uli526x.c:1086:4: note: ...this ‘else’ clause, but it is not } else ^ Hope this is helpful Dave Signed-off-by: David Malcolm Signed-off-by: David S. Miller Signed-off-by: Arnd Bergmann --- drivers/net/ethernet/dec/tulip/uli526x.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.9.0 diff --git a/drivers/net/ethernet/dec/tulip/uli526x.c b/drivers/net/ethernet/dec/tulip/uli526x.c index 80afec335a11..f6b8edf6516e 100644 --- a/drivers/net/ethernet/dec/tulip/uli526x.c +++ b/drivers/net/ethernet/dec/tulip/uli526x.c @@ -1115,7 +1115,7 @@ static void uli526x_timer(unsigned long data) netif_carrier_off(dev); } } - db->init=0; + db->init = 0; /* Timer active again */ db->timer.expires = ULI526X_TIMER_WUT;