From patchwork Wed Jun 19 13:19:44 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 167238 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp726581ilk; Wed, 19 Jun 2019 06:20:26 -0700 (PDT) X-Google-Smtp-Source: APXvYqwI/8hbeprYkuNnkSUhl7n4/fWkFpBYaNZ+c4AYcmpFHSIiJ3/gV2XFmTHZEz+pnBa1wAvM X-Received: by 2002:a17:902:b098:: with SMTP id p24mr29064724plr.146.1560950426266; Wed, 19 Jun 2019 06:20:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1560950426; cv=none; d=google.com; s=arc-20160816; b=OR2LYBPOkILMvGcZg9DIKyaXuVFZiNzWfCGb7SEE4dqy1b9G44VGvnrn+F4EmnwcLU O9dBbQQ2TQOAmas2ryXLYKbAozeRRywKTDh+moHQLaM4Z4oxQ3k4NqYMs23SwM2lt/uV pBKm8uJIeMk5t0McSWRXMiBedDP9cE3jiHm19hQ8RGu3RvyqCYIEL2eiLg1dQl0YBdVy B28zaFTajyLO+37sv2tJhyD8xpi4qa4sGd7GInzAMgq1FEKJPffHJkZKiEQiTSEG6dhq bo2O4sgG/3xHijwbhfzusweMZcbOS6fSYYqM8WHSHF/duv68Tb+QQZ8ilG5awH1pVUUv uvfA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=YkrzgmIn8ZDsWDMZ4Yh4EMRVeoEjk33y5WrcF3sO25I=; b=YjsFNfaaMntAjo6jdCuC77H3neuCRvmBjkEXJbCLsa/nz8wuM5emS1+8PY/+wfaC9a D4uNfXjvMr/MLmJRpcaPl//bXZVK7zRJX9I6ttPHl5FdjUlKqfqzdsaoHGHBbc6edJ7Y BnRP/zRydNZLCR/03qM1ffoAeuoJMrDy1vwuccUsrqxiGF/t4xynbDmd64RKh2hyd4Ix amkWDYTldabtMMbJxuILyIjfh1huu4Cz4p+hITuFNnNIY/RnD88cghgkjjV60Qk8xaWc jg5YlWONcp/ygi4kxqAEdj3w6PWWi38D7SN60M8sMmrvOMsJ+cmuRjZBy9+73RM0iCQH FN+g== 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 a8si2983235pgi.208.2019.06.19.06.20.25; Wed, 19 Jun 2019 06:20:26 -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 S1731966AbfFSNUY (ORCPT + 30 others); Wed, 19 Jun 2019 09:20:24 -0400 Received: from mout.kundenserver.de ([212.227.17.24]:39181 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726330AbfFSNUX (ORCPT ); Wed, 19 Jun 2019 09:20:23 -0400 Received: from threadripper.lan ([149.172.19.189]) by mrelayeu.kundenserver.de (mreue107 [212.227.15.145]) with ESMTPA (Nemesis) id 1Mj7yt-1iIg1X2nOH-00fBKk; Wed, 19 Jun 2019 15:20:02 +0200 From: Arnd Bergmann To: Jiri Kosina , Jens Axboe Cc: Arnd Bergmann , Robert Elliott , Keith Busch , Hannes Reinecke , Omar Sandoval , Sakari Ailus , Andy Whitcroft , linux-block@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] [RESEND] floppy: fix harmless clang build warning Date: Wed, 19 Jun 2019 15:19:44 +0200 Message-Id: <20190619131959.2055400-1-arnd@arndb.de> X-Mailer: git-send-email 2.20.0 MIME-Version: 1.0 X-Provags-ID: V03:K1:9sLIhj4RYRE24WCHm3szMo8GZJ4FomoOvzRvWEJj02wygrg65IH 3/dU9k856rxtHNK3t4/hslHZyQJzy2g2X2ZTJf3XPB8w6RP7FX5Rw5hg2/9g1Z+0020tmKu 15F86/OrwblahiJQngqOmErumRAcMWRWPua/ZruSOPNeT9OVZBl5p5qTJ2O6ELfIGrGsezq 1OG08rxDPlmc7iqo7gt8A== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:ytyqrxA5jJA=:AgNeAiNF5GoxUuYp/hzPZs CO+U7Y8oJyRl5CTNKZ/25bkcDyvJzmUTmOQTKWWg7iWCdpnkC9UOHH1q4DR+bsH6gLeL2vmOn sY4dHITnPoHaKPjmB7bXx0HdKV8KbMagCOsIX9/pbPMfBPGDkmYmLafqbrkqU1Qi65zUdoI+k UThpwAElzGMSdcaLyrOxldYJXLi9w34VasizMbNgGzIoQ3e9rqBzdIU76WfQ9RfmyuvREmcvC wJSj3B6jLXRMcm+94AQqlEcxBMQTNF4FieTXgKwOy0tQPgfBQMIgIdgVgy5iLXqTf/EjLR2GW 9dkA284SkCt7r/U5WmTDX9PXVWW55fFFMgKUQM1LQklBwiWvWF4mg7LsSaRwV0f3iWAX+JM4y v2LvjAyIWPZBYlAl7FXzmHQfCpwBCgXeJwKwESMOoPck0M+JBtuSRMHdaEoMbLeXcvdDQmx/q +kYfKW0kg0ELVIyaLBSJlkPx4ilBTWMDEy/ueJ4k/jcjkG52ncuVtXAFzRoBHApnNCsXqz8Vv PdUt+leRK92fTojDjxVLn2wtYxEqt1tNPGt9GiIlG1/NhRNhHXe7G/MwtbgN2CWFa6Is986/z NGOVbSJyDXFnuJGQh/DH3yQ+hfwppVPSjtVEbNHNB5zdpItXJ698crNVzr0RGi96XSuOz7wDM YGavkGSNfvpeYZ6Kbm0RXwUpV2bW7BLizKBn8wMXzCE1qG1Vc0Q0vVS+cOchrFOzFaUsFTPjo jqL7c+P3BwdBOv8NU1a9jSBjOd6UAXbBc25APQ== Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org clang warns about unusual code in floppy.c that looks like it was intended to be a bit mask operation, checking for a specific bit in the UDP->cmos variable (FLOPPY1_TYPE expands to '4' on ARM): drivers/block/floppy.c:3902:17: error: use of logical '&&' with constant operand [-Werror,-Wconstant-logical-operand] if (!UDP->cmos && FLOPPY1_TYPE) ^ ~~~~~~~~~~~~ drivers/block/floppy.c:3902:17: note: use '&' for a bitwise operation if (!UDP->cmos && FLOPPY1_TYPE) The check here is redundant anyway, if FLOPPY1_TYPE is zero, then assigning it to a zero UDP->cmos field does not change anything, so removing the extra check here has no effect other than shutting up the warning. On x86, this will no longer read a hardware register, as the FLOPPY1_TYPE macro is not expanded if UDP->cmos is already zero, but the result is the same. Cc: Robert Elliott Cc: Keith Busch Link: https://patchwork.kernel.org/patch/10851841/ Signed-off-by: Arnd Bergmann --- The original patch did not get merged since there was some discussion (see link), but as far as I can tell, the outcome was that it's harmless so I just summarized the findings above. The patch is unchanged from March. --- drivers/block/floppy.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.20.0 diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c index 9fb9b312ab6b..b933a7eea52b 100644 --- a/drivers/block/floppy.c +++ b/drivers/block/floppy.c @@ -3900,7 +3900,7 @@ static void __init config_types(void) if (!UDP->cmos) UDP->cmos = FLOPPY0_TYPE; drive = 1; - if (!UDP->cmos && FLOPPY1_TYPE) + if (!UDP->cmos) UDP->cmos = FLOPPY1_TYPE; /* FIXME: additional physical CMOS drive detection should go here */