staging: rts5208: Simplify boolean expression to improve code style
authorTobias Nießen <tobias.niessen@stud.uni-hannover.de>
Wed, 26 Jun 2019 14:28:57 +0000 (16:28 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 1 Jul 2019 07:05:21 +0000 (09:05 +0200)
This bitwisen / boolean expression can be made more readable while
reducing the line lengths at the same time. This commit uses the
fact that

    a & (b | c) == (b | c)

evaluates to true if and only if

    (a & b) && (a & c)

is true. Since b and c are constants with relatively long names,
using the second form makes the code much more readable and shorter.

Signed-off-by: Tobias Nießen <tobias.niessen@stud.uni-hannover.de>
Signed-off-by: Sabrina Gaube <sabrina-gaube@web.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/rts5208/xd.c

index c5ee04e..f3dc96a 100644 (file)
@@ -1155,10 +1155,10 @@ static int xd_copy_page(struct rtsx_chip *chip, u32 old_blk, u32 new_blk,
                                        return STATUS_FAIL;
                                }
 
-                               if (((reg & (XD_ECC1_ERROR | XD_ECC1_UNCORRECTABLE)) ==
-                                               (XD_ECC1_ERROR | XD_ECC1_UNCORRECTABLE)) ||
-                                       ((reg & (XD_ECC2_ERROR | XD_ECC2_UNCORRECTABLE)) ==
-                                               (XD_ECC2_ERROR | XD_ECC2_UNCORRECTABLE))) {
+                               if (((reg & XD_ECC1_ERROR) &&
+                                    (reg & XD_ECC1_UNCORRECTABLE)) ||
+                                   ((reg & XD_ECC2_ERROR) &&
+                                    (reg & XD_ECC2_UNCORRECTABLE))) {
                                        rtsx_write_register(chip,
                                                            XD_PAGE_STATUS,
                                                            0xFF,