From patchwork Fri May 5 19:47:22 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 98736 Delivered-To: patch@linaro.org Received: by 10.182.142.97 with SMTP id rv1csp391473obb; Fri, 5 May 2017 12:50:51 -0700 (PDT) X-Received: by 10.84.129.131 with SMTP id b3mr68385514plb.1.1494013728722; Fri, 05 May 2017 12:48:48 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id n5si2698005pgk.367.2017.05.05.12.48.48; Fri, 05 May 2017 12:48:48 -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 S1755672AbdEETsr (ORCPT + 6 others); Fri, 5 May 2017 15:48:47 -0400 Received: from mout.kundenserver.de ([212.227.126.187]:61480 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755479AbdEETsh (ORCPT ); Fri, 5 May 2017 15:48:37 -0400 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue002 [212.227.15.129]) with ESMTPA (Nemesis) id 0LZqH7-1dlbLX0zFN-00lq5o; Fri, 05 May 2017 21:48:30 +0200 From: Arnd Bergmann To: Ben Hutchings Cc: stable@vger.kernel.org, Arnd Bergmann Subject: [PATCH 3.16-stable 64/87] staging: imx-drm: fix indentation warning Date: Fri, 5 May 2017 21:47:22 +0200 Message-Id: <20170505194745.3627137-65-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> X-Provags-ID: V03:K0:GuaEqBfmPEHElGdQK2gclw1pLQOHOSgGh6gpvnIWC4KA4Cd5J2G /Xw4JDEtixRuqcaR3VQwhd7RBx5UWgunSBtoa6OURaD+kZinCgrk7a5yqpVOFa8db5Rcvun u7fdwJ0l7Qq8HcqFwVBZJ6bMP8qQ95B+8rJZ+d5RHxPKNeN1saMDIU6bxL2UREh5iJYAnTo VIsEbZ6igC01H/J1J3oFg== X-UI-Out-Filterresults: notjunk:1; V01:K0:YfHjI6TmIks=:YsMH6bZ1ZCLPJxPWgK1gNz Qc7cz//tjXgMY5UySKJa9U7Z+xkxAzOaRPTVhdnz7sjodbiTJCyaH3mfGl2ObbslxDEJz35ro u4kaaIcPMKvs9t+bwo1p09tEBSJs0BeZAzigbdiM3g6bAX05yjjac4ceSzMJiFTb17rwJRlqO MnzOSFFvBA3qN/vQKSvAZfZslv9ik16wS2AtCs5CS7FDLBptjqs4+F4+8SneDCjXvR2pNADuQ rgLowyfYwKZby5Yu+Ef6phq4k5igVtbqUs8bsjWFGEmnWllYzFZWiLjJ8n3DhNkn0TT8J+16C JmwaKWyOzKYNSoA35Xr40VPdaV6huddE9olaEq+3DE0KMV6MYOJH7GfHPkMtti61DAIicEB43 1m2ad/ua+1QJUPhM1l/fQPTPLEITX7vnjbaTv7dvdRqZXRJZwDMRko+nNczKYc9xGEX5xM6sg H/+NqRRD9vGVlwthv8dMU+HJ9gvGHELUtKdNCsjDjH0vGDLvqWvitDLTd8pZLJ5cJ5MkGmH8b 002rDEiR9ZNEA8mQ9qA7jGDwrH2RSF3Vn7SWmApYiBwQ1bNg7XW6KkmVkAly3KWTjS+bkI75h YyjymAEFeU5bj6+IhQL92h+uzwAf96c0E4+sB3ElIV2buGCPLLMtt5BjOveyYkdqaTzvHFLKA FoUXyz3TPBq+q7PApGJtmfaXIe2CULdSHuwZ9N75c1PBWSqDQV03Hh6k0oYQPV7urVLQ= 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 18c9ccd460b7..6943449a8a48 100644 --- a/drivers/staging/imx-drm/imx-hdmi.c +++ b/drivers/staging/imx-drm/imx-hdmi.c @@ -968,7 +968,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.