floppy: fix harmless clang build warning
authorArnd Bergmann <arnd@arndb.de>
Wed, 19 Jun 2019 13:19:44 +0000 (15:19 +0200)
committerJens Axboe <axboe@kernel.dk>
Thu, 20 Jun 2019 07:36:21 +0000 (01:36 -0600)
commit2af47c10e80baf91cff56c44cec47402e05ac45c
treea0fc2961e2e7eb1ab9ec514d933b6c35c0fd98ee
parentf9bc64a0f0f884036d76d71edeaafb994c5ceddf
floppy: fix harmless clang build warning

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 <elliott@hpe.com>
Cc: Keith Busch <kbusch@kernel.org>
Link: https://patchwork.kernel.org/patch/10851841/
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
drivers/block/floppy.c