aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/rts5208/xd.c
diff options
context:
space:
mode:
authorTobias Nießen <tobias.niessen@stud.uni-hannover.de>2019-06-26 16:28:57 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-07-01 09:05:21 +0200
commit321cab4b5e56f2b5371da20de618c7c1a791ceb5 (patch)
tree72304c91a427aa5a1a24767fad1f894fc9bdc952 /drivers/staging/rts5208/xd.c
parentstaging: rts5208: Rewrite redundant if statement to improve code style (diff)
downloadlinux-dev-321cab4b5e56f2b5371da20de618c7c1a791ceb5.tar.xz
linux-dev-321cab4b5e56f2b5371da20de618c7c1a791ceb5.zip
staging: rts5208: Simplify boolean expression to improve code style
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>
Diffstat (limited to 'drivers/staging/rts5208/xd.c')
-rw-r--r--drivers/staging/rts5208/xd.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/staging/rts5208/xd.c b/drivers/staging/rts5208/xd.c
index c5ee04ecd1c9..f3dc96a4c59d 100644
--- a/drivers/staging/rts5208/xd.c
+++ b/drivers/staging/rts5208/xd.c
@@ -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,