From patchwork Wed Mar 13 21:11:02 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 160282 Delivered-To: patch@linaro.org Received: by 2002:a02:5cc1:0:0:0:0:0 with SMTP id w62csp14775185jad; Wed, 13 Mar 2019 14:24:47 -0700 (PDT) X-Google-Smtp-Source: APXvYqzaSYbbulChOdo5qrWsw7LvoPi9ztnNbrzznQcK7/VRA+OU3LsUZhDE46g2iMl5FCUg1xWt X-Received: by 2002:a62:1f58:: with SMTP id f85mr45938412pff.39.1552512286935; Wed, 13 Mar 2019 14:24:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1552512286; cv=none; d=google.com; s=arc-20160816; b=iL/jq+y8f4+3Ps0ucOTrJceZfY3Q/olsgz0h27gBo/TMAd6laPw6LUVLU/PNA0l3hM SAlyeST8wTCyphDULlFbHPhU94xZithNcFV3UuTIrnkW55HuOYIDoP/8sPeCsplCs6U1 kRIcb5MKrjk3vLwjtoKh6o0RTXoxAcARxL5MKbrRxJx9Cy90Xp/oEyjRIhck5ZULbf3a 2vSnpd4GUE0bT3WrVxNmRyWc9/10DqhyVRsL+XMp/0o7Luxin3IWAtj/AsgEXVmZJLtq ZIxVvX6ei3kA/vZzRikAHAEbS0l0Rxa1HKZ788Cn5ynurWEa5rklRBjx8HazcO5H0HXg dL5g== 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=wHqBCGZBqTslHP0FVkHpdooZeIy06vctpru0uDS3ihQ=; b=I0+5BikdE0Yfahw/4SnnGSc39LIERfXksltd3h3V60wpoWxs9vvcuMHT+sOZ57Ouy5 NApD/tXoUvoZpeRilThQN++UcDGZe2t/P3SxbuETiNBWcI4sj3+5D24w5tsAcC7tKUf8 QJg2RfeOT9bkdCyEAAU6keR4AaPiyl+IdZXvtEGTsyJhIOT7LVT0WWYv0feflFenFYY7 eFsK4zuYME1LsRQWiSW9DMzxTEPuvDRMjJnZ59/AauQMbGBnDlKuK+yDafQjZZfz+Ptj wYn8jxlTfLEes/xzNgwIVbrDBfT8FMlzCl0YUfJETyvtMP5bvGH9uNkQSvZ33lkWFFVr W4qw== 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 t23si11368936pfa.64.2019.03.13.14.24.46; Wed, 13 Mar 2019 14:24:46 -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 S1727525AbfCMVYo (ORCPT + 31 others); Wed, 13 Mar 2019 17:24:44 -0400 Received: from mout.kundenserver.de ([217.72.192.73]:42145 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726125AbfCMVYo (ORCPT ); Wed, 13 Mar 2019 17:24:44 -0400 Received: from wuerfel.lan ([109.192.41.194]) by mrelayeu.kundenserver.de (mreue107 [212.227.15.145]) with ESMTPA (Nemesis) id 1McYP5-1gTl3Z2Q4z-00cynt; Wed, 13 Mar 2019 22:14:36 +0100 From: Arnd Bergmann To: Jiri Kosina , Jens Axboe Cc: Arnd Bergmann , Omar Sandoval , Hannes Reinecke , linux-block@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] floppy: fix harmless clang build warning Date: Wed, 13 Mar 2019 22:11:02 +0100 Message-Id: <20190313211433.4178148-1-arnd@arndb.de> X-Mailer: git-send-email 2.20.0 MIME-Version: 1.0 X-Provags-ID: V03:K1:Gg1ro3XTPV2CCnela4QdedSa5uOGKvbolUTUSWpPuuuqS8tnu4F dXo0/b52lEpwhb2oj3fT2xacyiDcmUA5SVQbNCqwM/2Zb16vxs7/aWT6Vi6sr+m8PTfdMxx JxqFkDx6Zj+PxczCPZLx1yg7kINf9QBuvmFQ/rTup+LrnPJ4gsRhkP0Ef6elj0UFEkXnzoL N5PkT9TbA2TftsSx8lIYw== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:sFFuG74Vyyk=:7d62AIaI7pn379Sxg50mjW hVuM47pfFc4VyK5QvJHxlVN+wqIyDT4I/L6KZLDqEWWQ2LyHkzN7LWy+EI45S1PtWIYy9aec0 nkSsELWZjdzlFIX0rI/eH0Gh4qshel149Zw9QhLxB0En7tQQOJ+b32WJko6wTPUGLb+cXIKXf Fwkb0s7SvvdRlk116e8s8Oij1Hv5fYRdUSatgJ5xNa++GuWjRIZUB3fYkyfVThgSY6yNWj3Cw 5sm0MnqX+aZw5xZaDD+pRbqNpWA5pundvikFui4ZXfZ9VgZiw5ypf0TRKFBeO48mXU5aJmzOU rhNMVS0GZY9VqOVSrY4K5/nbXHDSz/PbeUrt8jNUMHNdP7YBMguT9oGhub+6XLdy19MPa5mvj rqqTt1A89SAbbahVaeXZNQrly5Spk2uKc9EP60dpEUkY7nV6HbbA/rARF7ZtiEzDn7gAg9hkl 43dgwL1qO+R0kcWprtzZkJhqiFwp38ibRIiCLnZOHfztrHxBCeM8BHExLhwH4qnPeNJDkZ+iQ LRnuTWkUDBjP8BdX88aWbOJNhoz+Jvzl8ErHLhfQlz6LN/PkFTe3vFVXxOne97dpWK42ibb11 osL7m7xrqcXA0zju4UFRcBldHzYvm5W73UGGV5xr7mlUJFlK4vlkKvifVhJwNyqHTIbjlJpAS CPQ4aYEdWPz3ab46wSsLeTekBKwyiaTqDFjkZgowO5hIWfR+xs4iOQ5MPbOOUpLY/4KKVIKj8 JDPT4/v8a54Nv57eUGAmHXdH4hyPx3FYakr5cw== 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. Signed-off-by: Arnd Bergmann --- 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 95f608d1a098..56815446ed85 100644 --- a/drivers/block/floppy.c +++ b/drivers/block/floppy.c @@ -3899,7 +3899,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 */