From patchwork Wed Jun 7 22:57:34 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Willy Tarreau X-Patchwork-Id: 103325 Delivered-To: patch@linaro.org Received: by 10.182.29.35 with SMTP id g3csp1991142obh; Wed, 7 Jun 2017 16:34:01 -0700 (PDT) X-Received: by 10.84.238.131 with SMTP id v3mr30753496plk.168.1496878441921; Wed, 07 Jun 2017 16:34:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1496878441; cv=none; d=google.com; s=arc-20160816; b=DOu7rn02S18vP3fdpRcHXBHSqbCjZBRSptxJkhZzsMvxERPpEP90MrEXlcKX6hktJm G9Q5T+AQxHT2YAsLGbP9n1yvOsAz4VgbBslrnMpNJfb+UmKlSjdx0Mw0CEsGr8AYOxsr X7pdU5C1QypTKincNwC0ibZaD2jYx+oYNIKLNW2PSPjZhmwII4znCDRjrSbzQL6Alj/z v4ZyWpozmtDC7OJjBNmKJNYFuIt65HmByt/Z4be8dEZYyb3mpzswIt6scBB1PSRAfGp7 jxYXl1cV1JN3jP4/A/wrKVS4k3e4cP9GgZ7cSrk8eVor/sEM6EIoYf3Atnh1qcv4cCnZ sPvA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=CgNERQ4ulSfRcRPrAYowIFGsI4DxMVv9tyLv1lxQtM4=; b=T/6jY7sqEsEpft0ezmr+xX+MOcCRaxl46P+DCpu9x7tbZgcJ13DfnNASHrBodfJaOq 7Sk7RGKeEdkJd0E+Ow+tvE+zpCPvH/DQ6DktZ+/GpbqFn7Mpy818JPd9W2FY+Y0x7xT8 nzfkKbXMRAgjlJ0uV/O4T0psvjYrPlFZsYQDReBuvwXbZXtenIaMvpReS78SHZHOnEC2 B6nlzvoTX9LFghI3wC69xliRra9xh9WAXDoUqu2w9nDHgATiRA5X6jrX0BNfkKOgSzmb qyZp74KqvXG5uzgHh3SUiV2YO8zAwhP62coUnyd+YQu1VZcK5qSWC8I6dfN0aqbj0xms pmrA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id t10si2869521plh.401.2017.06.07.16.34.01; Wed, 07 Jun 2017 16:34:01 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753390AbdFGXd7 (ORCPT + 25 others); Wed, 7 Jun 2017 19:33:59 -0400 Received: from wtarreau.pck.nerim.net ([62.212.114.60]:50732 "EHLO 1wt.eu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753255AbdFGXFO (ORCPT ); Wed, 7 Jun 2017 19:05:14 -0400 Received: (from willy@localhost) by pcw.home.local (8.15.2/8.15.2/Submit) id v57N14jZ032766; Thu, 8 Jun 2017 01:01:04 +0200 From: Willy Tarreau To: linux-kernel@vger.kernel.org, stable@vger.kernel.org, linux@roeck-us.net Cc: Arnd Bergmann , "Martin K . Petersen" , Willy Tarreau Subject: [PATCH 3.10 068/250] scsi: mvsas: fix command_active typo Date: Thu, 8 Jun 2017 00:57:34 +0200 Message-Id: <1496876436-32402-69-git-send-email-w@1wt.eu> X-Mailer: git-send-email 2.8.0.rc2.1.gbe9624a In-Reply-To: <1496876436-32402-1-git-send-email-w@1wt.eu> References: <1496876436-32402-1-git-send-email-w@1wt.eu> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Arnd Bergmann commit af15769ffab13d777e55fdef09d0762bf0c249c4 upstream. gcc-7 notices that the condition in mvs_94xx_command_active looks suspicious: drivers/scsi/mvsas/mv_94xx.c: In function 'mvs_94xx_command_active': drivers/scsi/mvsas/mv_94xx.c:671:15: error: '<<' in boolean context, did you mean '<' ? [-Werror=int-in-bool-context] This was introduced when the mv_printk() statement got added, and leads to the condition being ignored. This is probably harmless. Changing '&&' to '&' makes the code look reasonable, as we check the command bit before setting and printing it. Fixes: a4632aae8b66 ("[SCSI] mvsas: Add new macros and functions") Signed-off-by: Arnd Bergmann Reviewed-by: Johannes Thumshirn Signed-off-by: Martin K. Petersen Signed-off-by: Willy Tarreau --- drivers/scsi/mvsas/mv_94xx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.8.0.rc2.1.gbe9624a diff --git a/drivers/scsi/mvsas/mv_94xx.c b/drivers/scsi/mvsas/mv_94xx.c index 1e4479f..55716c5 100644 --- a/drivers/scsi/mvsas/mv_94xx.c +++ b/drivers/scsi/mvsas/mv_94xx.c @@ -621,7 +621,7 @@ static void mvs_94xx_command_active(struct mvs_info *mvi, u32 slot_idx) { u32 tmp; tmp = mvs_cr32(mvi, MVS_COMMAND_ACTIVE+(slot_idx >> 3)); - if (tmp && 1 << (slot_idx % 32)) { + if (tmp & 1 << (slot_idx % 32)) { mv_printk("command active %08X, slot [%x].\n", tmp, slot_idx); mvs_cw32(mvi, MVS_COMMAND_ACTIVE + (slot_idx >> 3), 1 << (slot_idx % 32));