From mboxrd@z Thu Jan 1 00:00:00 1970 From: Arnd Bergmann Subject: [PATCH 09/14] SFI: fix tautological-compare warning Date: Fri, 14 Jul 2017 11:30:12 +0200 Message-ID: <20170714093021.1341005-1-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, Len Brown 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 V2l0aCBjY2FjaGUgaW4gY29tYmluYXRpb24gd2l0aCBnY2MtNiwgd2UgZ2V0IGEgaGFybWxlc3Mg d2FybmluZyBmb3IgdGhlIHNmaSBzdWJzeXN0ZW0sCmFzIGNjYWNoZSBvbmx5IHNlZXMgdGhlIHBy ZXByb2Nlc3NlZCBzb3VyY2U6Cgpkcml2ZXJzL3NmaS9zZmlfY29yZS5jOiBJbiBmdW5jdGlvbiDi gJhzZmlfbWFwX3RhYmxl4oCZOgpkcml2ZXJzL3NmaS9zZmlfY29yZS5jOjE3NTo1MzogZXJyb3I6 IHNlbGYtY29tcGFyaXNvbiBhbHdheXMgZXZhbHVhdGVzIHRvIHRydWUgWy1XZXJyb3I9dGF1dG9s b2dpY2FsLWNvbXBhcmVdCgpVc2luZyBhbiBpbmxpbmUgZnVuY3Rpb24gdG8gZG8gdGhlIGNvbXBh cmlzb24gdGVsbHMgdGhlIGNvbXBpbGVyIHdoYXQgaXMKZ29pbmcgb24gZXZlbiBmb3IgcHJlcHJv Y2Vzc2VkIGZpbGVzLCBhbmQgYXZvaWRzIHRoZSB3YXJuaW5nLgoKU2lnbmVkLW9mZi1ieTogQXJu ZCBCZXJnbWFubiA8YXJuZEBhcm5kYi5kZT4KLS0tCiBkcml2ZXJzL3NmaS9zZmlfY29yZS5jIHwg OSArKysrKystLS0KIDEgZmlsZSBjaGFuZ2VkLCA2IGluc2VydGlvbnMoKyksIDMgZGVsZXRpb25z KC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9zZmkvc2ZpX2NvcmUuYyBiL2RyaXZlcnMvc2ZpL3Nm aV9jb3JlLmMKaW5kZXggMjk2ZGI3YTY5YzI3Li5hOGYyMzEzYTI2MTMgMTAwNjQ0Ci0tLSBhL2Ry aXZlcnMvc2ZpL3NmaV9jb3JlLmMKKysrIGIvZHJpdmVycy9zZmkvc2ZpX2NvcmUuYwpAQCAtNzEs OSArNzEsMTIgQEAKIAogI2luY2x1ZGUgInNmaV9jb3JlLmgiCiAKLSNkZWZpbmUgT05fU0FNRV9Q QUdFKGFkZHIxLCBhZGRyMikgXAotCSgoKHVuc2lnbmVkIGxvbmcpKGFkZHIxKSAmIFBBR0VfTUFT SykgPT0gXAotCSgodW5zaWduZWQgbG9uZykoYWRkcjIpICYgUEFHRV9NQVNLKSkKK3N0YXRpYyBp bmxpbmUgYm9vbCBvbl9zYW1lX3BhZ2UodW5zaWduZWQgbG9uZyBhZGRyMSwgdW5zaWduZWQgbG9u ZyBhZGRyMikKK3sKKwlyZXR1cm4gKGFkZHIxICYgUEFHRV9NQVNLKSA9PSAoYWRkcjIgJiBQQUdF X01BU0spOworfQorCisjZGVmaW5lIE9OX1NBTUVfUEFHRShhZGRyMSwgYWRkcjIpIG9uX3NhbWVf cGFnZSgodW5zaWduZWQgbG9uZylhZGRyMSwgKHVuc2lnbmVkIGxvbmcpYWRkcjIpCiAjZGVmaW5l IFRBQkxFX09OX1BBR0UocGFnZSwgdGFibGUsIHNpemUpIChPTl9TQU1FX1BBR0UocGFnZSwgdGFi bGUpICYmIFwKIAkJCQlPTl9TQU1FX1BBR0UocGFnZSwgdGFibGUgKyBzaXplKSkKIAotLSAKMi45 LjAKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmRyaS1k ZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczov L2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbAo= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753636AbdGNJbS (ORCPT ); Fri, 14 Jul 2017 05:31:18 -0400 Received: from mout.kundenserver.de ([212.227.126.135]:59663 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751190AbdGNJbQ (ORCPT ); Fri, 14 Jul 2017 05:31:16 -0400 From: Arnd Bergmann To: linux-kernel@vger.kernel.org, Len Brown 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 09/14] SFI: fix tautological-compare warning Date: Fri, 14 Jul 2017 11:30:12 +0200 Message-Id: <20170714093021.1341005-1-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> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Provags-ID: V03:K0:hd1nKn8Ni74HjCk1caFaj/ZCREhsjc/sH301HkaxXRLP1WjuJwr pE7pPlwNHp9VPbq83b8af8y15hpKMzLw/KLn3eSM+Su3Xnr0BxFvJkKJA/2uUPSKZy1L2Aa I8PjFJNt3I8VHpnFwC2f7C54M5QNUMZ5tv1Sda1p7ff27bO4/4pwJVAwgR7hqPDwNaEdE5e 9X1vJ0+3ojsSa/6H7x3KA== X-UI-Out-Filterresults: notjunk:1;V01:K0:wpDrTwKjQqA=:1MRVRkbnSch/neTC2YjGze 35osCz5S77ILh0ZqEZXKnye7xEujvroIQMOJJDsBhrNXttXwaQeqNBDkfx8kN1vVX3QSsQ87u YTnAEzp7W1wXsntHOgf48EWNUr9XGrjnR1GyhfXMFoG825hP1OJtf91RR3eJHVLJ2A0uEdovp 2NY9oI5rJdArt3x3p2sDk9sOrozQeIDXcXQWDFJnLJLOXofvw9usse2HvCVzO5a0EwDAHM6fi PnbL4frirqnsFgUeMKEpnz4h6xcLlyh2fGiXoaBqPZ1xW1a+tupo1SLjxa5Qql8WnXuZUNVa4 22kvhD7eEW3jAvMFsNaYsDtFYzOhPgU4XWnlaML473rv0LwdVIhCchFnT9pC9grg9ZKFJJXua BiP9BX1+Sa51+eZ0Egtug0pY9Lxp5tPhwRTrMYkiF4bUDOguExgHHtYxIvfm7K/y3+z9NpS6N nvnADUWNlMrQtR9asU0bSwgWtAJqJG9VpaOtc9QwicpqYbWmcuea9vQssR1J/IBs4V90TCkTf zA+OHKGp84UwU6tY3MsD5wpBk1r8KdnUbL9vDTHYMLlNJLs0/sS56rjpSgmihkGW0PyfXGeyO kNh+RQFxPnK4e5Ht+Cg4p/KssCf+QFjgNmrU2jOXa3PBuOMEUUVAlKs8G0+5F8mWLhE2RVNJp 10csQTTc3dxh1a54s7saJvA9ASByWpds2MiKlNXGV/BvNhwPO8leUivbdhpF/K2rlThEVTUo1 E6xEyiQtuuxPHd1x0QQMoW3yyXmlVK//iWVSCFHEhTiBhqTrYNtJw9a2D/g= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org With ccache in combination with gcc-6, we get a harmless warning for the sfi subsystem, as ccache only sees the preprocessed source: drivers/sfi/sfi_core.c: In function ‘sfi_map_table’: drivers/sfi/sfi_core.c:175:53: error: self-comparison always evaluates to true [-Werror=tautological-compare] Using an inline function to do the comparison tells the compiler what is going on even for preprocessed files, and avoids the warning. Signed-off-by: Arnd Bergmann --- drivers/sfi/sfi_core.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/drivers/sfi/sfi_core.c b/drivers/sfi/sfi_core.c index 296db7a69c27..a8f2313a2613 100644 --- a/drivers/sfi/sfi_core.c +++ b/drivers/sfi/sfi_core.c @@ -71,9 +71,12 @@ #include "sfi_core.h" -#define ON_SAME_PAGE(addr1, addr2) \ - (((unsigned long)(addr1) & PAGE_MASK) == \ - ((unsigned long)(addr2) & PAGE_MASK)) +static inline bool on_same_page(unsigned long addr1, unsigned long addr2) +{ + return (addr1 & PAGE_MASK) == (addr2 & PAGE_MASK); +} + +#define ON_SAME_PAGE(addr1, addr2) on_same_page((unsigned long)addr1, (unsigned long)addr2) #define TABLE_ON_PAGE(page, table, size) (ON_SAME_PAGE(page, table) && \ ON_SAME_PAGE(page, table + size)) -- 2.9.0