From patchwork Thu May 20 09:23:39 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 443222 Delivered-To: patch@linaro.org Received: by 2002:a02:7a1b:0:0:0:0:0 with SMTP id a27csp2181953jac; Thu, 20 May 2021 04:05:55 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxrXOyxqRL43tndXiFKsfDazD+jhbR2b16QR62keO6GK5DRPLdoPdl57onhdnBMLcFvqXMF X-Received: by 2002:a05:6602:2f0f:: with SMTP id q15mr5019879iow.75.1621508755443; Thu, 20 May 2021 04:05:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621508755; cv=none; d=google.com; s=arc-20160816; b=VfWEIQADptNdPAVpzUwm6IyfoRnO+w8TQrIjVPdIYUsmN+0we6B/FK5xoCtysEcDNB yBcJlnM1AVw4qeTXOVeGNAOOe18aGA2j5HKkugAScIJ/MGdQ4NIKTa/i7jwab1MB37uh rLIC3pQenjVugmeoyywF8cJVRKdm6Ex0FNMgjdGvH2DHKE+GzvXXB2xK4YZB+kd0jXsE kz+MSIsXr+d8f7kJy12YiCChplVcDXu5B6wVntHcWqjUs4ZbZekYtRRr2HbkkONOVxrX AZkQIrNXchMsibJGrWxgYScXQ9w+gGDHSoNhUY+swEoOO6uSKS1B3ruJBmBlatm1KR2H Vbww== 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=aH8dw45thaCnP0SxXAiBCP0+piDDSkGUKb/tfnVECvZTZFd2yIbVNGcnm9mM+t5Sw0 rXw0L78Kec7NG+tgO9BXIw3Le6zJwXqUgBuxwACpRlb0cpOrxY0mpq13pwpVEX43ZUbb 6se5Je1N0Ow2NVyVO6HRO/abGAZM1mzgVK7x4CcM6c6PgEDrMJRZtGYrHBPxA0gMSGjV 707ktSJRrEqbwvflLA/CE2fnbJn19Hyd4EKi99F0ZJeponLGjsR4FpwCsGJTrBMUsIOH cBhHvLz0dpeUpTBkRofSF7VSvhQ25ZkUXWhm72zGung/TCtokFWdlcCQO/nAlCOF8gTs HvFg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=yFnFhijP; 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 l17si2014715jaj.81.2021.05.20.04.05.55; Thu, 20 May 2021 04:05:55 -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=yFnFhijP; 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 S238043AbhETLHO (ORCPT + 12 others); Thu, 20 May 2021 07:07:14 -0400 Received: from mail.kernel.org ([198.145.29.99]:37896 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238862AbhETLFM (ORCPT ); Thu, 20 May 2021 07:05:12 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 0A3B661D27; Thu, 20 May 2021 10:05:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1621505108; bh=uTaG+Di4XS1WYWv0Dz6/jBPs2AoiU/Wa29VweIUts/o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=yFnFhijP1QJMTs8ts2tdgP+cJPB21x7l2uPvC0JsubLk119QmdkUPP+CGy3/z+7Tc Hyw0VAIlvjM9tFRKr13j7iAXu/mU79NKfdiGp6TQDX1TqPwgm/9gENVBE0W/DJMFIt U5dr6dGEI9wMLKBFz9FBaLBOXn5BTbybkTINoZD8= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Arnd Bergmann Subject: [PATCH 4.9 227/240] usb: sl811-hcd: improve misleading indentation Date: Thu, 20 May 2021 11:23:39 +0200 Message-Id: <20210520092116.335113868@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210520092108.587553970@linuxfoundation.org> References: <20210520092108.587553970@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)