From patchwork Thu May 4 20:52:00 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 98571 Delivered-To: patch@linaro.org Received: by 10.140.89.200 with SMTP id v66csp806352qgd; Thu, 4 May 2017 13:52:23 -0700 (PDT) X-Received: by 10.99.160.68 with SMTP id u4mr28930878pgn.39.1493931143439; Thu, 04 May 2017 13:52:23 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id x7si3136031pls.89.2017.05.04.13.52.23; Thu, 04 May 2017 13:52:23 -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 S1751023AbdEDUwW (ORCPT + 6 others); Thu, 4 May 2017 16:52:22 -0400 Received: from mout.kundenserver.de ([212.227.126.187]:65042 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751136AbdEDUwV (ORCPT ); Thu, 4 May 2017 16:52:21 -0400 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue001 [212.227.15.129]) with ESMTPA (Nemesis) id 0Lst3q-1e3CjA0y42-012aVv; Thu, 04 May 2017 22:52:18 +0200 From: Arnd Bergmann To: gregkh@linuxfoundation.org Cc: stable@vger.kernel.org, Arnd Bergmann Subject: [PATCH 04/13] [3.18-stable] staging: imx-drm: fix indentation warning Date: Thu, 4 May 2017 22:52:00 +0200 Message-Id: <20170504205209.498721-5-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170504205209.498721-1-arnd@arndb.de> References: <20170504205209.498721-1-arnd@arndb.de> X-Provags-ID: V03:K0:2bAwZe9ga1cTRCykHqvJKfzscH2S2J5EqSBFwgZHGKlgFa7WzA4 BitNyghUxqowWXKuqWnx4w4pYxiVJ+xmnHTVNJfJH7h9BJbHBbPiYxBtTpEbsC/h09rKS84 pOpt58Yg9gkFm4kFOfo2qqnGSNELq1QY7zlh0h568Z5wwwGMLRAfl5jlkUKP75CVU1ZO1hi nEiEYe8KyEGuc7bcce0Lg== X-UI-Out-Filterresults: notjunk:1; V01:K0:gLBdCwRSQ74=:2c8N8yzeDFPm22muFpbUw/ SMT9rko/rHopWis0oR75z4IVhY6SYCjXEbYbO1cG+UG6myX17zDHLzq26onVY1Nc5EmWvG4g/ kFPCWpNeltAEpMrPlamQHhmxRJoKY8xbaTQwOeo4Ix5Z+ejbOcKpt/+434YVhmcL6Sk1aBAl3 izurjqHq0HXLemVx2MU6auyAf+b5s+VNsgm664zjXG42oKTSF6Ye3F/1BmMzcpOa7/WQtsmyH jv4QwlaRxZmD8FxP91VzgtLNkUxF36fYj07/ueKD2urM2Mevvdn8uXBX51wGlNzEcDQbVFAUz ORdSBs623uZ4ytakthCHWCcPXYLo5/yeiE2dICDw/HVG4I1OwZpJBWggWx3IRFzxL4MRUnSRT lSk81aEMXHleGuH11yUA0EmBsgeEGkykl9w5urgp7dMVAYsS0/pKxR9bfwEkbtAeEplfzkzRV upNc8LgtEYWsD5Zix17bB3ehBjAZi8bmGVOQuw04pKmUW7bsKrsyCdzjmSYNdNfv1iQAiM4R8 bM5OzYdTnLufhTMUZfAaJ9FKb5MGytkO5wSOQrNHBGoO/RiPtZdDTGm2EhTy4J2d+6eN9Dltk cH88cYm8PrFlQqhgE8I4YlbI5H7ofh2u1wmYpu5tBfWJ//6nzIrNWGU7y5qxXxRTtE+uyXQAQ 66xZO/WVQNqZOfaFt29zC1Ax1Q+IoR7thsHkIpHxENIvpMiaXVcZwkVSB80aY5XfeRBE= Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org gcc-6 produces a harmless warning: drivers/staging/imx-drm/imx-hdmi.c: In function 'hdmi_config_AVI': drivers/staging/imx-drm/imx-hdmi.c:967:2: error: this 'else' clause does not guard... [-Werror=misleading-indentation] Commit d083c312cba2 ("drm: bridge/dw_hdmi: simplify hdmi_config_AVI() a little") in linux-4.3 fixes this with a larger rewrite that is not applicable here. After that rewrite, the variable that gets assigned here no longer exists. The assignment is rather pointless here, as we just set a variable to zero that is later added into another variable using a bitwise or operator, and that has no effect, so I'm just changing the indentation here to shut up the warning. The driver was originally merged in linux-3.13, and the fix applies to all versions between that and 4.2. Fixes: 9aaf880ed4ee ("imx-drm: Add mx6 hdmi transmitter support") Signed-off-by: Arnd Bergmann --- drivers/staging/imx-drm/imx-hdmi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.9.0 diff --git a/drivers/staging/imx-drm/imx-hdmi.c b/drivers/staging/imx-drm/imx-hdmi.c index aaec6b2cdf56..f1475ac718e9 100644 --- a/drivers/staging/imx-drm/imx-hdmi.c +++ b/drivers/staging/imx-drm/imx-hdmi.c @@ -967,7 +967,7 @@ static void hdmi_config_AVI(struct imx_hdmi *hdmi) else pix_fmt = HDMI_FC_AVICONF0_PIX_FMT_RGB; - under_scan = HDMI_FC_AVICONF0_SCAN_INFO_NODATA; + under_scan = HDMI_FC_AVICONF0_SCAN_INFO_NODATA; /* * Active format identification data is present in the AVI InfoFrame.