From mboxrd@z Thu Jan 1 00:00:00 1970 From: Arnd Bergmann Subject: [PATCH, RESEND 01/14] ide: avoid warning for timings calculation Date: Fri, 14 Jul 2017 11:25:13 +0200 Message-ID: <20170714092540.1217397-2-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, "David S. Miller" Cc: Arnd Bergmann , Greg Kroah-Hartman , dri-devel@lists.freedesktop.org, linux-ide@vger.kernel.org, Tejun Heo , akpm@linux-foundation.org, Linus Torvalds , Guenter Roeck , linux-media@vger.kernel.org List-Id: linux-ide@vger.kernel.org Z2NjLTcgd2FybnMgYWJvdXQgdGhlIHJlc3VsdCBvZiBhIGNvbnN0YW50IG11bHRpcGxpY2F0aW9u IHVzZWQgYXMKYSBib29sZWFuOgoKZHJpdmVycy9pZGUvaWRlLXRpbWluZ3MuYzogSW4gZnVuY3Rp b24gJ2lkZV90aW1pbmdfcXVhbnRpemUnOgpkcml2ZXJzL2lkZS9pZGUtdGltaW5ncy5jOjExMjoy NDogZXJyb3I6ICcqJyBpbiBib29sZWFuIGNvbnRleHQsIHN1Z2dlc3QgJyYmJyBpbnN0ZWFkIFst V2Vycm9yPWludC1pbi1ib29sLWNvbnRleHRdCiAgcS0+c2V0dXAgICA9IEVaKHQtPnNldHVwICAg KiAxMDAwLCAgVCk7CgpUaGlzIHNsaWdodGx5IHJlYXJyYW5nZXMgdGhlIG1hY3JvIHRvIHNpbXBs aWZ5IHRoZSBjb2RlIGFuZCBhdm9pZAp0aGUgd2FybmluZyBhdCB0aGUgc2FtZSB0aW1lLgoKU2ln bmVkLW9mZi1ieTogQXJuZCBCZXJnbWFubiA8YXJuZEBhcm5kYi5kZT4KLS0tCiBkcml2ZXJzL2lk ZS9pZGUtdGltaW5ncy5jIHwgMTggKysrKysrKysrLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwg OSBpbnNlcnRpb25zKCspLCA5IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvaWRl L2lkZS10aW1pbmdzLmMgYi9kcml2ZXJzL2lkZS9pZGUtdGltaW5ncy5jCmluZGV4IDBlMDVmNzU5 MzRjOS4uMTg1OGUzY2UzOTkzIDEwMDY0NAotLS0gYS9kcml2ZXJzL2lkZS9pZGUtdGltaW5ncy5j CisrKyBiL2RyaXZlcnMvaWRlL2lkZS10aW1pbmdzLmMKQEAgLTEwNCwxOSArMTA0LDE5IEBAIHUx NiBpZGVfcGlvX2N5Y2xlX3RpbWUoaWRlX2RyaXZlX3QgKmRyaXZlLCB1OCBwaW8pCiBFWFBPUlRf U1lNQk9MX0dQTChpZGVfcGlvX2N5Y2xlX3RpbWUpOwogCiAjZGVmaW5lIEVOT1VHSCh2LCB1bml0 KQkJKCgodikgLSAxKSAvICh1bml0KSArIDEpCi0jZGVmaW5lIEVaKHYsIHVuaXQpCQkoKHYpID8g RU5PVUdIKHYsIHVuaXQpIDogMCkKKyNkZWZpbmUgRVoodiwgdW5pdCkJCSgodikgPyBFTk9VR0go KHYpICogMTAwMCwgdW5pdCkgOiAwKQogCiBzdGF0aWMgdm9pZCBpZGVfdGltaW5nX3F1YW50aXpl KHN0cnVjdCBpZGVfdGltaW5nICp0LCBzdHJ1Y3QgaWRlX3RpbWluZyAqcSwKIAkJCQlpbnQgVCwg aW50IFVUKQogewotCXEtPnNldHVwICAgPSBFWih0LT5zZXR1cCAgICogMTAwMCwgIFQpOwotCXEt PmFjdDhiICAgPSBFWih0LT5hY3Q4YiAgICogMTAwMCwgIFQpOwotCXEtPnJlYzhiICAgPSBFWih0 LT5yZWM4YiAgICogMTAwMCwgIFQpOwotCXEtPmN5YzhiICAgPSBFWih0LT5jeWM4YiAgICogMTAw MCwgIFQpOwotCXEtPmFjdGl2ZSAgPSBFWih0LT5hY3RpdmUgICogMTAwMCwgIFQpOwotCXEtPnJl Y292ZXIgPSBFWih0LT5yZWNvdmVyICogMTAwMCwgIFQpOwotCXEtPmN5Y2xlICAgPSBFWih0LT5j eWNsZSAgICogMTAwMCwgIFQpOwotCXEtPnVkbWEgICAgPSBFWih0LT51ZG1hICAgICogMTAwMCwg VVQpOworCXEtPnNldHVwICAgPSBFWih0LT5zZXR1cCwgICBUKTsKKwlxLT5hY3Q4YiAgID0gRVoo dC0+YWN0OGIsICAgVCk7CisJcS0+cmVjOGIgICA9IEVaKHQtPnJlYzhiLCAgIFQpOworCXEtPmN5 YzhiICAgPSBFWih0LT5jeWM4YiwgICBUKTsKKwlxLT5hY3RpdmUgID0gRVoodC0+YWN0aXZlLCAg VCk7CisJcS0+cmVjb3ZlciA9IEVaKHQtPnJlY292ZXIsIFQpOworCXEtPmN5Y2xlICAgPSBFWih0 LT5jeWNsZSwgICBUKTsKKwlxLT51ZG1hICAgID0gRVoodC0+dWRtYSwgICAgVVQpOwogfQogCiB2 b2lkIGlkZV90aW1pbmdfbWVyZ2Uoc3RydWN0IGlkZV90aW1pbmcgKmEsIHN0cnVjdCBpZGVfdGlt aW5nICpiLAotLSAKMi45LjAKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNr dG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2Ry aS1kZXZlbAo= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753580AbdGNJ1c (ORCPT ); Fri, 14 Jul 2017 05:27:32 -0400 Received: from mout.kundenserver.de ([212.227.17.10]:60898 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751190AbdGNJ13 (ORCPT ); Fri, 14 Jul 2017 05:27:29 -0400 From: Arnd Bergmann To: linux-kernel@vger.kernel.org, "David S. Miller" Cc: Greg Kroah-Hartman , Linus Torvalds , Tejun Heo , Guenter Roeck , linux-ide@vger.kernel.org, linux-media@vger.kernel.org, akpm@linux-foundation.org, dri-devel@lists.freedesktop.org, Arnd Bergmann Subject: [PATCH, RESEND 01/14] ide: avoid warning for timings calculation Date: Fri, 14 Jul 2017 11:25:13 +0200 Message-Id: <20170714092540.1217397-2-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:2t/MNlSFGgbXQUQnxUrYx6kN+F2j5AlqnzmeEoew3N0LSwI8WkM v7KosatX+TePKQELje/JPUZ3da9xavNr8X7LtnUdswWP/3Yi86zfp+wLG7ptlAGY5b5rMDe WPWuc1NrYWRhrx1cqmDHLKCSJJo+sPhInedizMI69sISwGti+FwzwGlz7gKyflA0jRsvznw uIutTC6HCN+FnOagF+A2g== X-UI-Out-Filterresults: notjunk:1;V01:K0:7lygw3z5amo=:gCNM/t0iNs6e7h+bskfPsA CHTUpukmvK/I3O8AA62qVtjFjLY6FZ5AjhH/oE9Yth2Yob7JAKlsSh1PdHa1TFRmnVnBNaBtv nc0t3n1vYsRtKlycBfPNXPCIm2JnbNlwGeMRYUlyoIQ3ERwa98VJSqQ2EmMdoy/ao1eZ9T+C4 TV1BDa3++OXOGogMDrwpFaNEwq0zffPysJ2plP0xYnbJCs2dd+xz4Boz20SLi00Hr8nK7S5e8 cyY/MKF/txWXRehw5rgHZYP2YMtgdjLKVyVlzAUHTlDSTDrQMhnfszfdC729woxQEFvRrwcyS T4zja3kwZ37GS3MmQb4NvK1/WgxNZ2nHmAwz81y3+YMq7T9NHTFOPiGRLttiYedhsV1hTb0CI tguegN4B9QYL0mrpfVw8MzQro7N/8ss+j5LzxBR3URWzWtGcXhtyPGq8rjNJSsD7bE6qcsn5P EUDL0T/kt5phYlVRM6NztFO+ycRU9XD0IAgXHOSLwn6ypi9b+lCfD2fuw8E5g7iXYNPY024Gv BtwhKfP3/N36WM+cHl44QE6YGhIvwY25tJGL1/luOsfbRL98kPP8Kt1NQv6szKCfYI+QjNBAe k5hOQUYjsigoxq0LTmcMFDOVRDrV5PddzFaR82a1116PLKIg1v5EWGwJEka9CD8pl3MTHUKMA 88b6l+3W/gh0XekF90Zdcg/GsGkHCIqEl/MTlG773Av7s/w3DquVYITBCgoQ6W3JJcxBO1PU8 ouKi6MIQNtTyTBZZdar5KUjH5QlzDuNp/JgZPw== 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..1858e3ce3993 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