From patchwork Wed Sep 6 21:45:34 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 111841 Delivered-To: patch@linaro.org Received: by 10.140.94.166 with SMTP id g35csp1555950qge; Wed, 6 Sep 2017 14:46:02 -0700 (PDT) X-Google-Smtp-Source: ADKCNb7OvdSjSESB+j2r266SJ6JRk51AIl3+kUPEYMYOBU/SsXmjpUleabLqd/QLwibbUVu2nico X-Received: by 10.98.48.194 with SMTP id w185mr528602pfw.231.1504734362565; Wed, 06 Sep 2017 14:46:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1504734362; cv=none; d=google.com; s=arc-20160816; b=YAFgVnyJ6WEX6oOOzFCkUQylbKwF4T4cfEJzSdzOA4i3s9hnd4/KyHzoO6WY7NDdfE 7G7t5WTQOD64kAmbgUzW6jcqKrg6aZLDIdqS05JeUaEcw6JhTVgkopu7riLe0drH/z+N uVhcuzGc62uRZlroaPtOmG37/X833c8kGEfGQvzbIEx0fEq30hcXYtcZDcXMitt7BLOe JP7N67GHnrL1NUMccNveVC/3dJASFqpjBQ4hkcqkEk0VVJuFNTuZ+PzOWU6Z2IaFd3pX iI70elOZWOsiozFbwDRJlGIo6jbJoD5j7LGNY8l0KMiUU0u2yGqkSkRxDF5F9E/JFiMI 8dQQ== 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=Qnhecu/lXDgyPdXidGH91oesQXrV0qpKr3W7wS3ONm0=; b=q0izTtPBCtuWILiS4JCyUOQnf45OXZ6MTVfYQL7R91x9Pj3O1NKdXF4mByFrq/xvmD IHveXKM/Y7nUU+81VrQBENvlYyn1BiH3aewF2MgoEYBBjjUaptxJ4Rm1cEy2NKrFqcbU tEXumdPmgMsr3auWL7vEo3Xi+KvGewA1OjsgZvwrBtxYXKgIw1Hlh/hDqzPnJYQQn1cq CPotsJIm3Fe6O/tqy6HJFz3KEmPzpHjCOZ/+YkQqSnmEv97BEJW5RHTdCRFGKIvNIb32 4dJLu+iKpONwKw/FERMRHwwI7VLahx3YPXw43UFCe+Rjlh3nclTdrTwyBw3TTYrDDltO OYvw== 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 t7si666115pgo.121.2017.09.06.14.46.02; Wed, 06 Sep 2017 14:46:02 -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 S1753495AbdIFVp7 (ORCPT + 26 others); Wed, 6 Sep 2017 17:45:59 -0400 Received: from mout.kundenserver.de ([212.227.126.134]:62372 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752597AbdIFVp5 (ORCPT ); Wed, 6 Sep 2017 17:45:57 -0400 Received: from wuerfel.lan ([95.208.190.237]) by mrelayeu.kundenserver.de (mreue003 [212.227.15.129]) with ESMTPA (Nemesis) id 0MOVST-1dmhT22Omb-005mf7; Wed, 06 Sep 2017 23:45:53 +0200 From: Arnd Bergmann To: Tejun Heo Cc: Arnd Bergmann , linux-ide@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] [RESEND] ata: avoid gcc-7 warning in ata_timing_quantize Date: Wed, 6 Sep 2017 23:45:34 +0200 Message-Id: <20170906214552.2111904-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:QUUTPLxEwkLg0gOEaNKPcxlwx1fi6u7E9mBk6lMzh1EKs0c4cKS E2xeIrppDXhMmv5p7A9JnVH78qt6zJjKrhBvuClRWucc7YCKNSPLGKD4ADhrJ+z1g1Mt+V5 hJXKpjdnfaZS0n1ZOnykDcwMrqlPEzJIgzQXTcuDF5UTOEpLv7klCgXLB3gkYPuSOnRFGsj x5HZTd4rkSezjvEGUwmmQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:11KgErezUx4=:zWjVwHLCHCb0/WUe+L3cEv vBWlCkQznDS35tgUQGOCFqVxfcYvdDgAFjuhMaidSWHsE/fHQDuloG6sEXsFCbKlFjbq+y2Kl Kqf5bbI99VV8eYta3xfTuCh5NitLdkBXpTiWH1uBZDRgJhmQ67W+SbiwkJeBPn55adHod9wz4 +SfkWPplLzs49Mn8psxju69rIRTCeEB33S7CsHciyjB2mUQRrnsH04ilUYKRXdj90xzLfEp6M xMSUwZ9FTGpKbM6QzcSO96V41uch4aIKZSdJe5nwhHgXdlo9IWKlf8Dult25Ktzbv8i1UvJ+u nyZuW7+GN9cAjGTWw6NCHjdpskBpB59WWFnX0B+wak/MOIbpEIeW1oga8+X3qter8QrrXAAI8 ZnAr7omQqTX6opC25wvQ0kIEnwj+A7OvW+7wEWEVlcMmGCZPFYZXfVAj3ZSY/5HJQPNxymHjA azIwZZpBYzljCHu0JgTBIhIAiduC/sXjwehu1al1ESlvJB+VHPrYdffAURzL+TkFHJtSlLeBc h7mv3iyTcqpO7oZ/nSj47bcXO5Cn8sA+RwNc3tX1y+3qxRP7AmyHx2kvGnOmfC705PGQezwL7 o68bxMrM/adLjNGYnkxS30gZXzQq9Ihvlhb730efTFkw7r4OGaKpdiXJxkMBr3BLq+So2vWgS HucN87YMYOJ9vgG/n5n0U66Je9D5TBv61fMpGR71vMTxBMLxsvhaGB+01eHflp2uX4v9bvU8b wI3MMyH8bj4SbuAiBrUGTBlQ9PIPsBN5F1ZDzg== 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/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 --- Hi Tejun, I just noticed this patch among others I had previously sent but that were not applied. It seems I forgot to reply to your Ack after it had become clear that the serious would not get merged in one chunk. Please apply this for 4.14. Link: https://patchwork.kernel.org/patch/9840269/ --- drivers/ata/libata-core.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) -- 2.9.0 diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c index 1945a8ea2099..ee4c1ec9dca0 100644 --- a/drivers/ata/libata-core.c +++ b/drivers/ata/libata-core.c @@ -3234,19 +3234,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,