From patchwork Wed Mar 23 10:39:31 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 102539 Delivered-To: patch@linaro.org Received: by 10.112.199.169 with SMTP id jl9csp2584153lbc; Wed, 23 Mar 2016 03:40:39 -0700 (PDT) X-Received: by 10.98.87.216 with SMTP id i85mr3044154pfj.61.1458729639039; Wed, 23 Mar 2016 03:40:39 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id z13si3628903pas.7.2016.03.23.03.40.38; Wed, 23 Mar 2016 03:40:39 -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 S1754823AbcCWKk3 (ORCPT + 29 others); Wed, 23 Mar 2016 06:40:29 -0400 Received: from mout.kundenserver.de ([212.227.17.24]:58596 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754156AbcCWKkT (ORCPT ); Wed, 23 Mar 2016 06:40:19 -0400 Received: from wuerfel.lan. ([78.42.132.4]) by mrelayeu.kundenserver.de (mreue103) with ESMTPA (Nemesis) id 0LhDFP-1ZxCI30fw7-00oWLk; Wed, 23 Mar 2016 11:39:44 +0100 From: Arnd Bergmann To: Ian Molton , Russell King Cc: Arnd Bergmann , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH] ARM: floppy: avoid gcc-6 warning Date: Wed, 23 Mar 2016 11:39:31 +0100 Message-Id: <1458729581-3195712-1-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 2.7.0 X-Provags-ID: V03:K0:SgkIWdhL1A82x3arzfYixWFdnPOlEiWRuM1c+LU/T7726Kzje5i ewdoDhNsfB20hzNhnmL/YO0U4tgtpYHF29Opb8SMJh1pS6OI3ogbIRR3Tr4b0fsCkenRCKx /4e+ohAUK98hPepSER33+8oSClJjZsqyuKvlOYLwTYessBiAHRoDKVoJa7hToV0b00PzxMC dA9xaEBhp2skclRzGCDaQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:aHgJNzZ2eZs=:Ay9IZDbihS87D8C1MCBl6V 3AC8CgFilx7IzhztgQ1wL2dIgicFCpyTzuJx4HlnvvXj/yt0wtoHimLWcTByD8oML65x7KAaI qfUzTktvyUe/PfXQxaYc7p0OAHLP+OH/RWC1mNCCJtEtXPjrIVUbN0b2olLofGMCzatm5h7N+ T3yHSdWrr/tGdDQqo9Nri0j53lz9F/uGPGNnVpAeb+GpOxIJUarkwYvb1pewoU+sdAFCrGsr5 GpY1aqzl+ChkuzBqvb5MMrk7gZpZ/nZvAkqywNopxJnJHXNLyUswun5/cM8v55UfOE53GAPTQ dMv1uKrmPo0UiYJZt7/ibN50zX+721mgWAIzGpkzlS0XhXM7DigqnoF8TaMqXgqpCLDnSMWJ+ uZmIy9tmsdAY9/96/w1fnRGbbL2oUOvPEPZvYzlkotP7dyQUSrbhnLW8FTqfLBWD5Ft/JXOgD 2hE3ADoEwaS5ZuPbae7Qut2wg8gr1S8t6CjF4x3Y0AKeoHNI4kZwKj5QxIfHSs46ADQm+Lvp2 eqPbHuIn1jcZ7NpaRSJCyyitY+fSIGK0xejrYiQnnBm9/Cj5CsGqekl6wamLk/lO1lvRnlRm7 R6B/p7svxlHVH5mHDUyLCd7EtObJOqMcoTWiRGxw/UxOC5eJ9l/t5HF85A2Rky7leM5z3bDa0 MPQ0lzK6IsRLGL5rxCSO2XNKTT74R9V72Qf59JuCsxNL4dnq86RTG/Qot04+w71mvrjU= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org gcc-6.0 warns about comparisons between two identical expressions, which is what we get in the floppy driver when writing to the FD_DOR register: drivers/block/floppy.c: In function 'set_dor': drivers/block/floppy.c:810:44: error: self-comparison always evaluates to true [-Werror=tautological-compare] fd_outb(newdor, FD_DOR); It would be nice to use a static inline function instead of the macro, to avoid the warning, but we cannot do that because the FD_DOR definition is incomplete at this point. Adding a cast to (u32) is a harmless way to shut up the warning, just not very nice. Signed-off-by: Arnd Bergmann --- arch/arm/include/asm/floppy.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.7.0 diff --git a/arch/arm/include/asm/floppy.h b/arch/arm/include/asm/floppy.h index f4882553fbb0..85a34cc8316a 100644 --- a/arch/arm/include/asm/floppy.h +++ b/arch/arm/include/asm/floppy.h @@ -17,7 +17,7 @@ #define fd_outb(val,port) \ do { \ - if ((port) == FD_DOR) \ + if ((port) == (u32)FD_DOR) \ fd_setdor((val)); \ else \ outb((val),(port)); \