From mboxrd@z Thu Jan 1 00:00:00 1970 From: Arnd Bergmann Subject: [PATCH, RESEND 02/14] ata: avoid gcc-7 warning in ata_timing_quantize Date: Fri, 14 Jul 2017 11:25:14 +0200 Message-ID: <20170714092540.1217397-3-arnd@arndb.de> References: <20170714092540.1217397-1-arnd@arndb.de> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20170714092540.1217397-1-arnd@arndb.de> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: linux-kernel@vger.kernel.org, Tejun Heo Cc: Damien Le Moal , Arnd Bergmann , Greg Kroah-Hartman , dri-devel@lists.freedesktop.org, linux-ide@vger.kernel.org, Geert Uytterhoeven , Hannes Reinecke , Adam Manzanares , akpm@linux-foundation.org, Mauro Carvalho Chehab , Linus Torvalds , Guenter Roeck , linux-media@vger.kernel.org List-Id: linux-ide@vger.kernel.org Z2NjLTcgd2FybnMgYWJvdXQgdGhlIHJlc3VsdCBvZiBhIGNvbnN0YW50IG11bHRpcGxpY2F0aW9u IHVzZWQgYXMKYSBib29sZWFuOgoKZHJpdmVycy9hdGEvbGliYXRhLWNvcmUuYzogSW4gZnVuY3Rp b24gJ2F0YV90aW1pbmdfcXVhbnRpemUnOgpkcml2ZXJzL2F0YS9saWJhdGEtY29yZS5jOjMxNjQ6 MzA6IHdhcm5pbmc6ICcqJyBpbiBib29sZWFuIGNvbnRleHQsIHN1Z2dlc3QgJyYmJyBpbnN0ZWFk IFstV2ludC1pbi1ib29sLWNvbnRleHRdCgpUaGlzIHNsaWdodGx5IHJlYXJyYW5nZXMgdGhlIG1h Y3JvIHRvIHNpbXBsaWZ5IHRoZSBjb2RlIGFuZCBhdm9pZAp0aGUgd2FybmluZyBhdCB0aGUgc2Ft ZSB0aW1lLgoKU2lnbmVkLW9mZi1ieTogQXJuZCBCZXJnbWFubiA8YXJuZEBhcm5kYi5kZT4KLS0t CiBkcml2ZXJzL2F0YS9saWJhdGEtY29yZS5jIHwgMjAgKysrKysrKysrKy0tLS0tLS0tLS0KIDEg ZmlsZSBjaGFuZ2VkLCAxMCBpbnNlcnRpb25zKCspLCAxMCBkZWxldGlvbnMoLSkKCmRpZmYgLS1n aXQgYS9kcml2ZXJzL2F0YS9saWJhdGEtY29yZS5jIGIvZHJpdmVycy9hdGEvbGliYXRhLWNvcmUu YwppbmRleCBmYTdkZDQzOTRjMDIuLjQ1MDA1OWRkMDZiYSAxMDA2NDQKLS0tIGEvZHJpdmVycy9h dGEvbGliYXRhLWNvcmUuYworKysgYi9kcml2ZXJzL2F0YS9saWJhdGEtY29yZS5jCkBAIC0zMjMx LDE5ICszMjMxLDE5IEBAIHN0YXRpYyBjb25zdCBzdHJ1Y3QgYXRhX3RpbWluZyBhdGFfdGltaW5n W10gPSB7CiB9OwogCiAjZGVmaW5lIEVOT1VHSCh2LCB1bml0KQkJKCgodiktMSkvKHVuaXQpKzEp Ci0jZGVmaW5lIEVaKHYsIHVuaXQpCQkoKHYpP0VOT1VHSCh2LCB1bml0KTowKQorI2RlZmluZSBF Wih2LCB1bml0KQkJKCh2KT9FTk9VR0goKCh2KSAqIDEwMDApLCB1bml0KTowKQogCiBzdGF0aWMg dm9pZCBhdGFfdGltaW5nX3F1YW50aXplKGNvbnN0IHN0cnVjdCBhdGFfdGltaW5nICp0LCBzdHJ1 Y3QgYXRhX3RpbWluZyAqcSwgaW50IFQsIGludCBVVCkKIHsKLQlxLT5zZXR1cAk9IEVaKHQtPnNl dHVwICAgICAgKiAxMDAwLCAgVCk7Ci0JcS0+YWN0OGIJPSBFWih0LT5hY3Q4YiAgICAgICogMTAw MCwgIFQpOwotCXEtPnJlYzhiCT0gRVoodC0+cmVjOGIgICAgICAqIDEwMDAsICBUKTsKLQlxLT5j eWM4Ygk9IEVaKHQtPmN5YzhiICAgICAgKiAxMDAwLCAgVCk7Ci0JcS0+YWN0aXZlCT0gRVoodC0+ YWN0aXZlICAgICAqIDEwMDAsICBUKTsKLQlxLT5yZWNvdmVyCT0gRVoodC0+cmVjb3ZlciAgICAq IDEwMDAsICBUKTsKLQlxLT5kbWFja19ob2xkCT0gRVoodC0+ZG1hY2tfaG9sZCAqIDEwMDAsICBU KTsKLQlxLT5jeWNsZQk9IEVaKHQtPmN5Y2xlICAgICAgKiAxMDAwLCAgVCk7Ci0JcS0+dWRtYQkJ PSBFWih0LT51ZG1hICAgICAgICogMTAwMCwgVVQpOworCXEtPnNldHVwCT0gRVoodC0+c2V0dXAs ICAgICAgIFQpOworCXEtPmFjdDhiCT0gRVoodC0+YWN0OGIsICAgICAgIFQpOworCXEtPnJlYzhi CT0gRVoodC0+cmVjOGIsICAgICAgIFQpOworCXEtPmN5YzhiCT0gRVoodC0+Y3ljOGIsICAgICAg IFQpOworCXEtPmFjdGl2ZQk9IEVaKHQtPmFjdGl2ZSwgICAgICBUKTsKKwlxLT5yZWNvdmVyCT0g RVoodC0+cmVjb3ZlciwgICAgIFQpOworCXEtPmRtYWNrX2hvbGQJPSBFWih0LT5kbWFja19ob2xk LCAgVCk7CisJcS0+Y3ljbGUJPSBFWih0LT5jeWNsZSwgICAgICAgVCk7CisJcS0+dWRtYQkJPSBF Wih0LT51ZG1hLCAgICAgICBVVCk7CiB9CiAKIHZvaWQgYXRhX3RpbWluZ19tZXJnZShjb25zdCBz dHJ1Y3QgYXRhX3RpbWluZyAqYSwgY29uc3Qgc3RydWN0IGF0YV90aW1pbmcgKmIsCi0tIAoyLjku MAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRl dmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8v bGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753610AbdGNJ1d (ORCPT ); Fri, 14 Jul 2017 05:27:33 -0400 Received: from mout.kundenserver.de ([212.227.17.10]:62343 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753535AbdGNJ13 (ORCPT ); Fri, 14 Jul 2017 05:27:29 -0400 From: Arnd Bergmann To: linux-kernel@vger.kernel.org, Tejun Heo Cc: Greg Kroah-Hartman , Linus Torvalds , Guenter Roeck , linux-ide@vger.kernel.org, linux-media@vger.kernel.org, akpm@linux-foundation.org, dri-devel@lists.freedesktop.org, Arnd Bergmann , Adam Manzanares , Mauro Carvalho Chehab , Hannes Reinecke , Geert Uytterhoeven , Damien Le Moal Subject: [PATCH, RESEND 02/14] ata: avoid gcc-7 warning in ata_timing_quantize Date: Fri, 14 Jul 2017 11:25:14 +0200 Message-Id: <20170714092540.1217397-3-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170714092540.1217397-1-arnd@arndb.de> References: <20170714092540.1217397-1-arnd@arndb.de> X-Provags-ID: V03:K0:OlUIYmocaf2jkkax68/a7FO2BzKYdJ0d5XpbOiMsvCA84hRqA4u HJ4K+wmOhC5pskP7nMwyMZ8mhOqnLFVoGzaZ5ZuWLWrqpykhEV46/mF94UYy5tSgdmjHgKV d96O2+T66a8IZvqrmzT+OXHu7N9t5j40129ZmMVuHmp+TBu+KEMNRG0gl7Bl775X6vJO7dA dY2g8xRruu0p1bG4qCOhQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:I+rkV/wPpVI=:w0jWgEOCVJ4ZJYpbOun5Rs DBgYhcsyjFaMSwoBpf0r+t320CqbE288k/xJh5AcQakyE3c3ip8gLYAqrfdCcoYnHRiEPSGzp f9cF9XnnK5CXszyHXfAQYqnoNa+pGA8xt+Hq+xauHbggiA6m9a1shwc/2zpiMxDTrwA6n+/aN wc0KgBuVWtkg7kyYxDPJrx0tzZcLm3rE2jF8POPbe/6oDwBhPONOgnX03VIHwsMhFQVn+t0tS RU2cnTyLC18+p/EXrBCH6V6VMv+k9V3Ioqt8ZICol8bf6FjnTHt0ouNHCdNy9mfI5prHIP0jB XHrBbYAVLFXWUhJW3sOSnV8u1J518yS5aDs30aGZqux8Iw5ViIGE60AlaW8gK/Y+Xv5s02KZZ AhnKKYkudksN2rLE9PVuqfNFa1OtgX7x+4vAFkqbxsnxGXlkYIFrW6+XZotwT2o3ZlmMEKZwv /ChZNE3opIq+jT6lpfwJ7AG5PcAet1/51eIqQWQStjbl+Y3SmgrB/VNgvXx1AHG/+kNbra6PC esJ9ODhwSXDbBvWBVOXFJUXb3ymol577jhMTCqfCAV/alEAo8G9NZZwyfgJrkmiPIcHZmRIM3 Ahz8jHTnI/tRdaAGUw+shHajouhEJeUCYARdSBTL3kfToog/UTMZlbmGo4wgWZprV27vvYSp/ s6gobIaRuMXJbPdusK0OCn7dUU1/fF9SCdHkhrnRmSzn+1X33Cue7Mk3ByLp+8ug6UZJvwgTk mH6H+ghm6RNpXo+dIRU2/d8xPWB7DJ93jHmfpA== 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/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 fa7dd4394c02..450059dd06ba 100644 --- a/drivers/ata/libata-core.c +++ b/drivers/ata/libata-core.c @@ -3231,19 +3231,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, -- 2.9.0