From patchwork Thu May 20 09:22:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 443201 Delivered-To: patch@linaro.org Received: by 2002:a02:7a1b:0:0:0:0:0 with SMTP id a27csp2145426jac; Thu, 20 May 2021 03:14:25 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxa2hWrQR7GGxor8vnkxJ5+lPcGa2C4eJUi3mIZxgOzeUJyvNkCvihvFbG+TOd3ahIXcYgz X-Received: by 2002:a6b:c30f:: with SMTP id t15mr4043193iof.17.1621505665617; Thu, 20 May 2021 03:14:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621505665; cv=none; d=google.com; s=arc-20160816; b=xfgJ/6uFSbFUNTV2Kuv2egmulZ7WdOKDDbDs27jgB2zqdHCleccxUTGjvFNejiy+OS FNLW9lGRHnsP4/GAp3guleD9WOFyEhedj+cEUxgF5vnZ8a2rw5HPFpp6S7jK1iRrevwV RjWetx1y7twAPV/TC6g/Vd+cgu4Ht3beDewTJGyWTlvjNMh52GiBXtkZXx34bZMIhaAP Pbh0qNOQ7AQSsqBsdC6kc6y/sDrXcKibWvGLT79nqlaJuveP9suZrGELAFPAutg//ZOF tSznsgycepfuBtHLth8ErdoxU1ZbGdbWoKR5IyPcH8Tix2hzN5iOitYnxVqThDtSMZiZ g8YQ== 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=OwrXbM5IcbtcmTk74u2vcqC0ydPXVGz8c/yYAlrDYZcwEBVFhT+1B0mZHSl2vP/XFA znTaIYaR28IytIV6Lu5IK0k+0ivDagLDUg4T2I2/LV0UkywLR/w8kg6zWwTL+/DF60YV ESlVZsNZMGMQmFNeZ6Fkb+34yqy6T9oMzgRyB/nsPmCk1D/jIidX74PXnWyE3c424q1V eQMa20jZVBWmIjEkHx+YUf8Gs3UmA6rOadmIT5p2SMRlb9h1iVyAuJ4KNX+E1kASKUdn F9ugeCg7cihOrv3drbgVax4DC3bxcQ+pfkrZkJZk9p/6UD5VDft3BFUPttZqxokEGVVi U2hA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=ia6eLYpb; 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 b26si1907477ios.29.2021.05.20.03.14.25; Thu, 20 May 2021 03:14:25 -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=ia6eLYpb; 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 S234970AbhETKPf (ORCPT + 12 others); Thu, 20 May 2021 06:15:35 -0400 Received: from mail.kernel.org ([198.145.29.99]:47008 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235714AbhETKMH (ORCPT ); Thu, 20 May 2021 06:12:07 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id D76C36195E; Thu, 20 May 2021 09:43:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1621503827; bh=DsBOTJL5ir0zrcnF3XcMFfXwg59YIrtgqteA1mt4Cyk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ia6eLYpbf/3I2CHQ547ooCSDRkmjKTQWFgcL0hCm3cN6kGz4y3fHAzkdwPiEvpZMa MCKGBjTM0j+RgTwQp/lxHsqJf28h4n43G7hbfzxbVM7ASoV4DhyLl4xRClR1rzv5MZ 2BeXpGBDgVwcIGbBsENujunq+JHbA2o6F3QRKeE0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Arnd Bergmann Subject: [PATCH 4.19 396/425] usb: sl811-hcd: improve misleading indentation Date: Thu, 20 May 2021 11:22:45 +0200 Message-Id: <20210520092144.416966837@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210520092131.308959589@linuxfoundation.org> References: <20210520092131.308959589@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)