From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932885AbdEKMw0 (ORCPT ); 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 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 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(-) 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, -- 2.9.0