From patchwork Tue Feb 20 11:54:55 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 10229847 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 3933F602B1 for ; Tue, 20 Feb 2018 11:58:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2A8BB28607 for ; Tue, 20 Feb 2018 11:58:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1EE572860F; Tue, 20 Feb 2018 11:58:39 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A66B828607 for ; Tue, 20 Feb 2018 11:58:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751733AbeBTL60 (ORCPT ); Tue, 20 Feb 2018 06:58:26 -0500 Received: from mout.kundenserver.de ([212.227.17.10]:45911 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751474AbeBTL6Y (ORCPT ); Tue, 20 Feb 2018 06:58:24 -0500 Received: from wuerfel.lan ([95.208.111.237]) by mrelayeu.kundenserver.de (mreue105 [212.227.15.145]) with ESMTPA (Nemesis) id 0M25gB-1eVKWc3kbr-00u1xm; Tue, 20 Feb 2018 12:58:14 +0100 From: Arnd Bergmann To: stable@vger.kernel.org Cc: Greg KH , linux-kernel@vger.kernel.org, Arnd Bergmann , Finn Thain , Michael Schmitz , "James E.J. Bottomley" , "Martin K. Petersen" , linux-scsi@vger.kernel.org Subject: [4.4-stable 08/22] ncr5380: shut up gcc indentation warning Date: Tue, 20 Feb 2018 12:54:55 +0100 Message-Id: <20180220115527.1806578-9-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20180220115527.1806578-1-arnd@arndb.de> References: <20180220115527.1806578-1-arnd@arndb.de> X-Provags-ID: V03:K0:RUU1clkYfgsUVnw1Lk3LddoZBmZfF0wyYU3cxDFccCW5k7Z70TV T2YzoVx7MGmX+Dlfga6HAoI7oUFKznNfZZtN+qrkLJaS9ty2tlr5LFJCJl6wOPx9eaO/AIe +5clOYYuzLAVVU24dJU2uVH99ZkVDpxsH73MhnOd2a1HOSHYgbtQByJ2LivRw0pYKyzTII4 r+EaYKKRKpxo4+ON2kWYA== X-UI-Out-Filterresults: notjunk:1; V01:K0:diMIuK4UFDY=:W89rTGggwEetSBNA+xw74n tSQpsokqeK6dX7Ol/fK7oxsR8U7fLg4vBtiNFgcT5u1gzan9k08G60b574kZjOX5HfGB8BxEg LcLsl3jdLYIsOZd5GRJcf/xtcDchYiI6vWQbPfi85GEb8UCvkRxcKhkzDSOcpidKw1pRaItLF dZfTxP5pikAg6P6nxnozcIClZxCnoPkLlPaYtFF0Pn25qkz8AEk0mMk6Cwq8fY0W3OMyA8BY2 RS/0diKg6VYx2xNucrLkuBDHXvaYdTTZWxkWRyv2/DePDbqLmCRSEB9oAfWkku+uy47qzq7xc ca1cUsnP2grgQFCsLoE0DtNWB3xDj+CXdGQKKFNzJe9iOJDrjjOjhgerG9OE+AFsbEH1NzPmi FjyocWu0s9rQEzVAGiByge3S6kZlUbTkOxwXkEiKeIbOXZ58O+KJ7u90V7D95EACgcqCZb1mF sQVrMrQu9v2CMd66ZsyUWwjzWN9gMYu7EVeSbNTs5lVOmZsuHMZstfE1QGiJCjnmuONjE63zD vkXT7M1NjgTOTOXzdh4HIFbGUUH9wcnjEzrJMG4atIte+k7+e+ADshbHx7C4aS7D+hlqCgEJV BB26wmj0JBVV0jiVr88A2uwzYQmcq0FbIB/lSWBOK1LnGU2nE5IcbpOg+KHw1GsyK1PLvBaIV 8dJ5NrwtQRaTTMblUQNViWNengnQLuick1IrWGhekkJEMnPP6ZsEq4aPfVS0i5dEsCevIO+58 crSMzfJZKOGYCxNcmH9YH7QO5pVsDnWWtdbkpg== Sender: linux-scsi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP gcc-6 and higher warn about the way some loops are written in the ncr5380 driver: drivers/scsi/g_NCR5380.c: In function 'generic_NCR5380_pread': drivers/scsi/g_NCR5380.c:541:3: error: this 'while' clause does not guard... [-Werror=misleading-indentation] while (NCR5380_read(C400_CONTROL_STATUS_REG) & CSR_HOST_BUF_NOT_RDY); ^~~~~ drivers/scsi/g_NCR5380.c:544:3: note: ...this statement, but the latter is misleadingly indented as if it is guarded by the 'while' This was addressed in mainline kernels as part of a rework on commit 12150797d064 ("ncr5380: Use runtime register mapping"). We don't want the entire patch backported to stable kernels, but we can backport one hunk to get rid of the warning. Signed-off-by: Arnd Bergmann Acked-by: Finn Thain --- drivers/scsi/g_NCR5380.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/scsi/g_NCR5380.c b/drivers/scsi/g_NCR5380.c index f8d2478b11cc..87e081f8a386 100644 --- a/drivers/scsi/g_NCR5380.c +++ b/drivers/scsi/g_NCR5380.c @@ -538,7 +538,10 @@ static inline int NCR5380_pread(struct Scsi_Host *instance, unsigned char *dst, printk(KERN_ERR "53C400r: Got 53C80_IRQ start=%d, blocks=%d\n", start, blocks); return -1; } - while (NCR5380_read(C400_CONTROL_STATUS_REG) & CSR_HOST_BUF_NOT_RDY); + while (NCR5380_read(C400_CONTROL_STATUS_REG) & CSR_HOST_BUF_NOT_RDY) + { + // FIXME - no timeout + } #ifndef SCSI_G_NCR5380_MEM {