From patchwork Thu May 20 09:23:16 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 443214 Delivered-To: patch@linaro.org Received: by 2002:a02:7a1b:0:0:0:0:0 with SMTP id a27csp2164966jac; Thu, 20 May 2021 03:42:31 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzdDz7XUHUN1CxLpaesKyeALamIZsPCCqe/owJ4kcn8b4X0L24miC622wLRZ3s7JOrCrLHn X-Received: by 2002:a17:906:3a82:: with SMTP id y2mr3038330ejd.145.1621507351688; Thu, 20 May 2021 03:42:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621507351; cv=none; d=google.com; s=arc-20160816; b=Q0YHqWTeXLBAKKylKxuSPi7mUh1lXhhjKGJRnS8QbKooPsfxvJ91oJahUZ+6BJkQTn q5fQGueuxIoqYUy7LTY4pnH/0zpkQ99a/XcgaZ0IrObhqmt0ZxfQr7M8g5aClAgpKkuz kckFIkSfHxN7OOq9jZ31Fa0u4mdZGtKSQdI/Ek5/CD2hsb42aqgnteqfSOCHFaVyTlhv fYAZkSNXoIHy0RiRVbXUPFDtzwURpKNfyMTrKuBLGcsi0OPkuGszlkXzx/9GOW/KCt5s bWR9/JIFNCUZKN3Rh9L8yxeE/yfBDUDHv9IC+JD7re0JB0PfXZxeS8DOrLUC2LEvZtCc eqzQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=tayOGHtiDKiPQeR5ML5UfhnROJUFxSWVUVmOYHOwyME=; b=cpdfXXZFqS7HWku1RLHLQyC9uM4f2pot6fiGm7tzGpvPZO+s/L5Zo2G80dcZvrqM7M i3WulX0u1+ttdD5bpPYiYh2bbaGEboHSbFrAqxnEdCVP/5rUO44f2i7Lz6rkoGQbo78h 1+VT05IjIw6wJyUe0fzxlEv6zEvlPjN4epI5bJXNmwkzrqzDVoJI+romIrGun/tW3ztW zO4sV8OyrcczcLrHnQQdmAjxUtQvWTVYhcMCc/5RNBk8d2IUWginvEWvPeMhRfMfbZR8 5wz45c1/sUsVYX77qUgTRed0OOfiLLyKunuIlZdm3PdMUVWO4OYFf37UzpHuo18Yr4ff MuTw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=lyv8woT2; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id t16si2432086edi.299.2021.05.20.03.42.31; Thu, 20 May 2021 03:42:31 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=lyv8woT2; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237548AbhETKnu (ORCPT + 12 others); Thu, 20 May 2021 06:43:50 -0400 Received: from mail.kernel.org ([198.145.29.99]:44690 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237553AbhETKln (ORCPT ); Thu, 20 May 2021 06:41:43 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 1642361C89; Thu, 20 May 2021 09:56:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1621504567; bh=uTaG+Di4XS1WYWv0Dz6/jBPs2AoiU/Wa29VweIUts/o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=lyv8woT2TOs04QdESWx0WdnIVD1QvtItK0lejcfQ9fYhrKNKlI26Q7FV1jn9CBwV8 llHbAk/oWoCSdlFu0B4Z3cSoqMVSezEHSR59+SK9xEXCXS4YCP23DhYpxO41w0qplx nkK822jix1eGpksPoAEIDsJsUeN1evUF55j83aX8= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Arnd Bergmann Subject: [PATCH 4.14 304/323] usb: sl811-hcd: improve misleading indentation Date: Thu, 20 May 2021 11:23:16 +0200 Message-Id: <20210520092130.656582232@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210520092120.115153432@linuxfoundation.org> References: <20210520092120.115153432@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Arnd Bergmann commit 8460f6003a1d2633737b89c4f69d6f4c0c7c65a3 upstream. gcc-11 now warns about a confusingly indented code block: drivers/usb/host/sl811-hcd.c: In function ‘sl811h_hub_control’: drivers/usb/host/sl811-hcd.c:1291:9: error: this ‘if’ clause does not guard... [-Werror=misleading-indentation] 1291 | if (*(u16*)(buf+2)) /* only if wPortChange is interesting */ | ^~ drivers/usb/host/sl811-hcd.c:1295:17: note: ...this statement, but the latter is misleadingly indented as if it were guarded by the ‘if’ 1295 | break; Rewrite this to use a single if() block with the __is_defined() macro. Signed-off-by: Arnd Bergmann Link: https://lore.kernel.org/r/20210322164244.827589-1-arnd@kernel.org Signed-off-by: Greg Kroah-Hartman --- drivers/usb/host/sl811-hcd.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) --- a/drivers/usb/host/sl811-hcd.c +++ b/drivers/usb/host/sl811-hcd.c @@ -1286,11 +1286,10 @@ sl811h_hub_control( goto error; put_unaligned_le32(sl811->port1, buf); -#ifndef VERBOSE - if (*(u16*)(buf+2)) /* only if wPortChange is interesting */ -#endif - dev_dbg(hcd->self.controller, "GetPortStatus %08x\n", - sl811->port1); + if (__is_defined(VERBOSE) || + *(u16*)(buf+2)) /* only if wPortChange is interesting */ + dev_dbg(hcd->self.controller, "GetPortStatus %08x\n", + sl811->port1); break; case SetPortFeature: if (wIndex != 1 || wLength != 0)