From patchwork Thu May 11 12:51:25 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 761060 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3wNtKT5Sk8z9ryr for ; Thu, 11 May 2017 22:51:57 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932654AbdEKMv4 (ORCPT ); Thu, 11 May 2017 08:51:56 -0400 Received: from mout.kundenserver.de ([217.72.192.74]:63891 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932181AbdEKMvz (ORCPT ); Thu, 11 May 2017 08:51:55 -0400 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue101 [212.227.15.145]) with ESMTPA (Nemesis) id 0M0i2I-1e1IbM3YUQ-00uraf; Thu, 11 May 2017 14:51:46 +0200 From: Arnd Bergmann To: Tejun Heo Cc: Arnd Bergmann , Adam Manzanares , linux-ide@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] ata: avoid gcc-7 warning in ata_timing_quantize Date: Thu, 11 May 2017 14:51:25 +0200 Message-Id: <20170511125145.265782-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:RquwZBtJ0tumNC72ueuufes316AQ3rgErjYE38NN7hHCUFO/lMB r6DzTM+kuyVAhlzhnPn44jA0a2vDo5gzOkIgj266uUHq/UnbPVv8Vn8ExG3sPkCgBtF17a5 uaE7spOuhYJ+w9CtOlYR1P/6EWAKSvwrIAGCo6AUJXzbZiQ+vm4j+Ns7EoXkiR3XWrniwka 4ycIviipS0yeN+35V49UQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:ZCimQ29b9Z8=:8ejy2qhi5xno8s9uuvS/+A LmQlUZL39YC0C74mxj02uzlI8rdyutjSig8DblcERyUhCZcRRML4uxRpXwS4ZBmorZYalaDAN IrfVl12pRbpodtN4Aqd876r1yXH6WhG5YEb0HPHAhs7Y45IhOpoCPLIWwned0ag5PuWyspcKC J1Ay8N9oy/KdLC4Sk/l+2q11aKEHJqINUpcWE6iRWcwEy71u8ZQPwz2upYoovcrcLaxO7awJe +W5NJu0B/RBJdTNMnjelFAtkSW1hRVvvMRmc5Cf3jH1v5phwqz2P99YCwYXtXp5Ql/IXuu7xt n/p+tWM7CFTGWII/9cfbRLDfah/6BOCiex30Vm7L4ElzIVXR8sEZSdoDNd0/KyTmK1MOkW+O/ E4gFwpRV1IQB9NFHWhxfbJmWxkjzCmL/dt3Tjj004fCqTwpexhPRIh1HYBnjOKBPrB9DPxyDh epGlok70S8tzh2rVmYOhoJwwyDRKqf00tnoMWqd7XtQxy0h7wY8gzl5yZLDBUStWX6LK7bGKt 2xMW/UA6Nrt+NFV7ZDnxO49zLSdnC8bqGGJX0e7T8BBfH7XmvkBSQ4vgqvzZFoMtkqvK7qg+g IgycEz+Gty9nHKoe12DUZ7mMtnGu55uORzzX37cKhRugMvcrpSPRckPHYvOe0/SJsz0admafP fE6bgwopnz3ZuKiMW7h1OSpFAZFqq990vrMRzBnq5ng53jE7NqjVk7lly09dXzSuMIJo= Sender: linux-ide-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ide@vger.kernel.org gcc-7 warns about the result of a constant multiplication used as a boolean: drivers/ata/libata-core.c: In function 'ata_timing_quantize': drivers/ata/libata-core.c:3164:30: warning: '*' in boolean context, suggest '&&' instead [-Wint-in-bool-context] This slightly rearranges the macro to simplify the code and avoid the warning at the same time. Signed-off-by: Arnd Bergmann --- drivers/ata/libata-core.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c index 2d83b8c75965..3fc4c35425f6 100644 --- a/drivers/ata/libata-core.c +++ b/drivers/ata/libata-core.c @@ -3157,19 +3157,19 @@ static const struct ata_timing ata_timing[] = { }; #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 ata_timing_quantize(const struct ata_timing *t, struct ata_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->dmack_hold = EZ(t->dmack_hold * 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->dmack_hold = EZ(t->dmack_hold, T); + q->cycle = EZ(t->cycle, T); + q->udma = EZ(t->udma, UT); } void ata_timing_merge(const struct ata_timing *a, const struct ata_timing *b,