From patchwork Thu May 20 09:24: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: 443229 Delivered-To: patch@linaro.org Received: by 2002:a02:7a1b:0:0:0:0:0 with SMTP id a27csp2196774jac; Thu, 20 May 2021 04:24:52 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzPQhFT7WYDe6osXgm+D7aDXRvG1557yVJuf2BPsWVu+uwTNv4f5NoQZTR/XSHEjtP2WJR0 X-Received: by 2002:a92:c56a:: with SMTP id b10mr4065495ilj.17.1621509892084; Thu, 20 May 2021 04:24:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621509892; cv=none; d=google.com; s=arc-20160816; b=LCMN+7KrRBRjy45TUNK2qWQURa9Hl5FZHVdqANnReV3w1qvT+4A67/cU3yBe/dV1sw lhGTcEDRLKB5/Lt82/UAEijFoZTwCTJRbIAc7P6Jprm203t8iBMajPhUv9KC55scAKeE gBWcCpDnf+reLh4gDzPzPnnBTmMoC8LVOxKIiAcneExt/ih6KjmQbj8nplkVGrnZDAdL 11NoL5lbUJYCYj9z9YFTmfA69mdCAb8TqkL7Ks8C3RnVaaY6hUGb3jQ1q9QY8cVS4/K8 MDusGa52zZaraw0eG3yfnnCju/4ZtxU77rNrFIr/00dKwk5+sBJ6ENwOIY3zw0BoH0S8 xyng== 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=WTW6L/vC7k5QRJ2JDJGGgDXZD5cYKxYpZGwOh0NQ5qUh1NF8csrU6UD7hodRASdGyP Q0IEYOoNJ6oWP6pP05dWtllyhEW1Eym8K0ahXO/uQ+cwR5bDgk6q6K0BtbwJd/pp0O/K ncd4rBpQFSKMfaOzgK5WDwos98FDsCr+WvvzXWNwb8iKJh8Ob0BY+3RtOxZOiXvToQBY IC+ZWcPAaQ7v3ThIiXQsHpsjJuxQsT33hNyqNooPFf+bf0LDmH/1xpQjikbKcTIA6/bX GkFEzv71iNkKRpsYahKBTNobGsAU6lp3kHh5XcefZCahv9GxB8/yEml7Ne/8VZA9Ykoe PY3w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=xPObnuzx; 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 b11si1937604iok.1.2021.05.20.04.24.51; Thu, 20 May 2021 04:24:52 -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=xPObnuzx; 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 S240435AbhETLZ7 (ORCPT + 12 others); Thu, 20 May 2021 07:25:59 -0400 Received: from mail.kernel.org ([198.145.29.99]:43054 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241252AbhETLYD (ORCPT ); Thu, 20 May 2021 07:24:03 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id B4B3661D8E; Thu, 20 May 2021 10:12:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1621505538; bh=uTaG+Di4XS1WYWv0Dz6/jBPs2AoiU/Wa29VweIUts/o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=xPObnuzxYcIspmr+1A79kmjnCP2rPk2paU+OhI2KR3DqifPrPTGZt1yHa66T03Q2E 6Rm2B0OvovERqChEZPGuNxwX9BDbDHScY8YVj2PZ6pytPM2rouaRUzjSfZu7o3PZOf NWxRV5x9oDYW0LrLyPcc9dpKWTS0gkz/2dDHiZxw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Arnd Bergmann Subject: [PATCH 4.4 179/190] usb: sl811-hcd: improve misleading indentation Date: Thu, 20 May 2021 11:24:03 +0200 Message-Id: <20210520092108.081016719@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210520092102.149300807@linuxfoundation.org> References: <20210520092102.149300807@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)