From patchwork Thu May 11 12:52:05 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 99647 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp714212qge; Thu, 11 May 2017 05:52:35 -0700 (PDT) X-Received: by 10.84.179.193 with SMTP id b59mr258905plc.56.1494507155477; Thu, 11 May 2017 05:52:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1494507155; cv=none; d=google.com; s=arc-20160816; b=aLgsyaPzU7logt3G3B1z6pgsCOkF81CZQuEBXMyVMcUHFxPnJVTw1e3FtR9Mi2EMNd zKGUg5cQobZxUIZCwvHt0YALWuqLk2YwuzGXqUhjshldBFMcnZJXAYPCpilTXuAdhmoZ gsMta8QJ5Y8zBHcoFfpgLFS5BM7izvTzsJDMz9JfRxyoT0gkt3O2ryfMV6Nl7otc/eEc XuY9DkirFRFcagNYr1DRPSKEmMQoz0avXu/ha/o21UwCMfD3ZPBLcDsTVGJm3buua03R R2GK9/GpNuwQSlqRUMQBfgNb23Jwfupw0tMH77pMdFF0i9CrPeCEkHWgsCZ3rMXjL//f LfXw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :arc-authentication-results; bh=rCIkAI2op/J1Jk6/xbJM0chyGwXpM8FpirX4vePp+1Q=; b=W2X/ZaDxDGk8LU3LiFIgzd8j35FKIswm2jcIndsM1XxrIMA3tZS8c2gOLDENYqrEw8 I93+JPQBjPUx16r5+vSbN9+1YcgLz2vYFKEXscxWPPXFQp7KagvNguuJ8M7fiLcliFBR mrK1MIRvHHpid7XrOAyjQ0o+aO7A2e8xyrgwS1t77mCMjZVcqx+04bLfQi9G7WikOpE+ CsamJwY+XKOiFIkK4TsPbCBkVThdvMuks1j1nW+GY8NHo94g3hrKn/RynSO1UPzjphU3 xizg2DY5i+8SXB82GBFzwucbVZXFbOw4k4IyxkewK430GWC4pwiTi+DK2pxMnRy47mzE umCA== 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 1si71396pgs.217.2017.05.11.05.52.35; Thu, 11 May 2017 05:52:35 -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 S932886AbdEKMw0 (ORCPT + 25 others); Thu, 11 May 2017 08:52:26 -0400 Received: from mout.kundenserver.de ([212.227.126.187]:56199 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754977AbdEKMwZ (ORCPT ); Thu, 11 May 2017 08:52:25 -0400 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue003 [212.227.15.129]) with ESMTPA (Nemesis) id 0MNQ45-1d6qi03IG9-006wRa; Thu, 11 May 2017 14:52:17 +0200 From: Arnd Bergmann To: "David S. Miller" Cc: Arnd Bergmann , linux-ide@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] ide: avoid warning for timings calculation Date: Thu, 11 May 2017 14:52:05 +0200 Message-Id: <20170511125214.278638-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:EOEnCb9q4isH2AKEbPNOTjHWP/3kOCPoPJiKqKFE2blQr1H+IJF KyGiBc/n9H0Yxi7CY5GrR1BJr8rlFKtpLGPpqh6vG6WymGxwGYZ2V0RKWUntxFunGCtZvEF jW4uY8YcvL8bqo7rltsNY9hT6kxKkP3I1sKQNTdvpBxnyjYp95s89O8ge7kSO1me/UYw8bn Bht584sQ5meB3pvYV6EHA== X-UI-Out-Filterresults: notjunk:1; V01:K0:7S+fMSbqOfU=:XWThPplJQ07QHt2jIxr5QM 5CauD5cCRZE2smFGq18t0oawf0Q1p4CfGadtgkwBpC7uzEFGfinI8b3ByBzgPxnoTpMrxTvAB bnf/OO7OP7Xiui/pbY8XlIoTXvWyP9ztVn8xbwcMPAarNyMqwQ0wD5WyrKuTCW89UGjnKCeUH 4v0vmSMcNNVVj7vob5OSvPnHPTvrN5SVBgE/buQ9zgyzUE1Uwpkpp4kUPyHs3V4gxbB+x4OYS tiLW6RijuigkpOTxK4/8GevR9IeCVO5KFZDL0ziuetQ4SBXZHNs41Crb8Eamj/MuoTCpztjJ3 aOZBPTPgf7ZgCo2AxP7w3SVn7SXCX8m7gp864G0neq1rnDzKx8Nl3hkSSud0C0C3Sj4BysBNn soYoq35WiBQ4GmJ374Cq6UN3b5IfbIJ7/8/fCbyHbNOEBSp5dtOEEzU9h0d+3xjVpA0mRu61R OVlgaNJJRPd7E+VseoOFHR7CWBK3MLOVi8iZeyM75qMnj5EGKDeMFJlztAYeNM99qVK05uC89 xxfGujbASh7InYPb1edKSYbVykVlNh7RUckiGZpGealNeWLtj6JLbONd/TxoDdSeT9V78m7Lq sVnj5OYMAX2j+bu3mXDJX0lnUIIXX+01lOU3sU3Kamn+6/IFtR/FKrn/Yjn4Zc07TukEv5Mp7 yKxmxf1glCMypqj1+weJYzRgSbdYEi8UJfPV8KngkU+HkGhLyTrTYsEywzZ7K+HgZGW4= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org gcc-7 warns about the result of a constant multiplication used as a boolean: drivers/ide/ide-timings.c: In function 'ide_timing_quantize': drivers/ide/ide-timings.c:112:24: error: '*' in boolean context, suggest '&&' instead [-Werror=int-in-bool-context] q->setup = EZ(t->setup * 1000, T); This slightly rearranges the macro to simplify the code and avoid the warning at the same time. Signed-off-by: Arnd Bergmann --- drivers/ide/ide-timings.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) -- 2.9.0 diff --git a/drivers/ide/ide-timings.c b/drivers/ide/ide-timings.c index 0e05f75934c9..9da64c1de85c 100644 --- a/drivers/ide/ide-timings.c +++ b/drivers/ide/ide-timings.c @@ -104,19 +104,19 @@ u16 ide_pio_cycle_time(ide_drive_t *drive, u8 pio) EXPORT_SYMBOL_GPL(ide_pio_cycle_time); #define ENOUGH(v, unit) (((v) - 1) / (unit) + 1) -#define EZ(v, unit) ((v) ? ENOUGH(v, unit) : 0) +#define EZ(v, unit) ((v) ? ENOUGH(v * 1000, unit) : 0) static void ide_timing_quantize(struct ide_timing *t, struct ide_timing *q, int T, int UT) { - q->setup = EZ(t->setup * 1000, T); - q->act8b = EZ(t->act8b * 1000, T); - q->rec8b = EZ(t->rec8b * 1000, T); - q->cyc8b = EZ(t->cyc8b * 1000, T); - q->active = EZ(t->active * 1000, T); - q->recover = EZ(t->recover * 1000, T); - q->cycle = EZ(t->cycle * 1000, T); - q->udma = EZ(t->udma * 1000, UT); + q->setup = EZ(t->setup, T); + q->act8b = EZ(t->act8b, T); + q->rec8b = EZ(t->rec8b, T); + q->cyc8b = EZ(t->cyc8b, T); + q->active = EZ(t->active, T); + q->recover = EZ(t->recover, T); + q->cycle = EZ(t->cycle, T); + q->udma = EZ(t->udma, UT); } void ide_timing_merge(struct ide_timing *a, struct ide_timing *b,