From eb2b3edfd427d11e9553aaf772b40fb18e42fbba Mon Sep 17 00:00:00 2001 From: Nishka Dasgupta Date: Wed, 29 May 2019 18:45:31 +0530 Subject: [PATCH] staging: rts5208: Remove negations Previously return variable fake_para was being negated before return. For simplification, fake_para can be changed to valid_para, which is returned without negation (corresponding values swapped accordingly). Further, the function names check_sd_current_prior and check_sd_speed_prior can be changed to valid_sd_current_prior and valid_sd_speed_prior respectively for greater clarity on the purpose of the functions. Signed-off-by: Nishka Dasgupta Signed-off-by: Greg Kroah-Hartman --- drivers/staging/rts5208/rtsx_chip.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/drivers/staging/rts5208/rtsx_chip.c b/drivers/staging/rts5208/rtsx_chip.c index 76c35f3c0208..17c4131f5f62 100644 --- a/drivers/staging/rts5208/rtsx_chip.c +++ b/drivers/staging/rts5208/rtsx_chip.c @@ -598,38 +598,38 @@ nextcard: return STATUS_SUCCESS; } -static inline int check_sd_speed_prior(u32 sd_speed_prior) +static inline int valid_sd_speed_prior(u32 sd_speed_prior) { - bool fake_para = false; + bool valid_para = true; int i; for (i = 0; i < 4; i++) { u8 tmp = (u8)(sd_speed_prior >> (i * 8)); if ((tmp < 0x01) || (tmp > 0x04)) { - fake_para = true; + valid_para = false; break; } } - return !fake_para; + return valid_para; } -static inline int check_sd_current_prior(u32 sd_current_prior) +static inline int valid_sd_current_prior(u32 sd_current_prior) { - bool fake_para = false; + bool valid_para = true; int i; for (i = 0; i < 4; i++) { u8 tmp = (u8)(sd_current_prior >> (i * 8)); if (tmp > 0x03) { - fake_para = true; + valid_para = false; break; } } - return !fake_para; + return valid_para; } static int rts5208_init(struct rtsx_chip *chip) @@ -796,13 +796,13 @@ int rtsx_init_chip(struct rtsx_chip *chip) chip->rw_fail_cnt[i] = 0; } - if (!check_sd_speed_prior(chip->sd_speed_prior)) + if (!valid_sd_speed_prior(chip->sd_speed_prior)) chip->sd_speed_prior = 0x01040203; dev_dbg(rtsx_dev(chip), "sd_speed_prior = 0x%08x\n", chip->sd_speed_prior); - if (!check_sd_current_prior(chip->sd_current_prior)) + if (!valid_sd_current_prior(chip->sd_current_prior)) chip->sd_current_prior = 0x00010203; dev_dbg(rtsx_dev(chip), "sd_current_prior = 0x%08x\n",