From patchwork Thu May 20 09:22:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 443171 Delivered-To: patch@linaro.org Received: by 2002:a02:7a1b:0:0:0:0:0 with SMTP id a27csp2112188jac; Thu, 20 May 2021 02:28:02 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz3dCBCUyc/Kfb8hOhwwjP44q9w9LhgNACQZ9Da0l5MQGrmbSJeV6G6UAFpl1diNaEWKoHz X-Received: by 2002:a17:906:79c8:: with SMTP id m8mr3828171ejo.260.1621502882721; Thu, 20 May 2021 02:28:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621502882; cv=none; d=google.com; s=arc-20160816; b=YrIff3ffrh84vSRQErP259vAad0n5zQ8edMuniz2ZphXlbku/vLYSgMHElwkAPBJ0M K82X1WDALFXJZ68jjM7JY/XA4eITjwdonf9YrIfuFIfgWvuvwPT7yQsZ86w014XMl3pe 26izKuLrU7b9ckijqdodfQ3YqnP7HainrGRtWj2hiN+bWLFA5YlgXAjpJ09DJx/BtJjz z2Ez4SquxtBvPN0RnBcT/4DJluHTOBOtj3PB6M66mnjUDKINnhGjAisUUvs2ql+ssTf0 TSdCZFcrmXNc5crU0sWYzBswxSbeNo44y2mMcnfelHeaGDWcbEwr/sNNItiOigO8S297 B2Zw== 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=8oeCbyb1cPeK0jWBOM10ccTp74es/gAColdRECiD2hM=; b=RLs24ZXIs1HlyUtaSSLYPOJhYCWGCvgmtn/zQbN5Q3PRZGTGDPICI/JCXarSZ7kylY G1ERn0OuAGwm7dEHwQqSyecT3/qt6y/Yahgk4pG39IWrKArIgDJmz7kPWUdKjo5/PwcE I3gY266efyPRZVlyqB4mrqb6ZlTk/s5qD7ocWq8XdaRbC2mUjg4yCiKPntWmB7UJwImE hUgc3TRFG9A65oIRoZoR5mIfqkJMNbnoAKb7fQhWjJYJsYqUrVRVOR1BMUsY4gcBRvIS 84tGzLbHV5tDalEu+W67lJaR/RF0a/ceZpJBf3RZZuU1IIQMX4CWGwiD723x7GIHdntv 2kDg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=UAo3FYaZ; 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 b24si1874955edt.411.2021.05.20.02.28.02; Thu, 20 May 2021 02:28:02 -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=UAo3FYaZ; 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 S232075AbhETJ3W (ORCPT + 12 others); Thu, 20 May 2021 05:29:22 -0400 Received: from mail.kernel.org ([198.145.29.99]:54054 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231883AbhETJ2A (ORCPT ); Thu, 20 May 2021 05:28:00 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 9AB516024A; Thu, 20 May 2021 09:26:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1621502793; bh=DsBOTJL5ir0zrcnF3XcMFfXwg59YIrtgqteA1mt4Cyk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UAo3FYaZCWNpiCqSAMKRDunKxCCIv3UP8D5ReAADyrQARcAfAL2FGO8WzY3xWAp0G poc+lAKOgg4JngjrUuZ36wZuy5HB2Pq+r+NUmDwZyhTruwLT+U/tJ+xWhUAEUdrsec YvEHb9dtBgG6acFjMFyF6BG7T49/gdueZ+kEP3Ls= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Arnd Bergmann Subject: [PATCH 5.10 05/47] usb: sl811-hcd: improve misleading indentation Date: Thu, 20 May 2021 11:22:03 +0200 Message-Id: <20210520092053.735115102@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210520092053.559923764@linuxfoundation.org> References: <20210520092053.559923764@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 @@ -1287,11 +1287,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)