redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

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 <nishkadg.linux@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
alistair/sunxi64-5.4-dsi
Nishka Dasgupta 2019-05-29 18:45:31 +05:30 committed by Greg Kroah-Hartman
parent 8fe0260030
commit eb2b3edfd4
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/staging/rts5208/rtsx_chip.c
View File

@ -598,38 +598,38 @@ nextcard:
return STATUS_SUCCESS; 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; int i;
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
u8 tmp = (u8)(sd_speed_prior >> (i * 8)); u8 tmp = (u8)(sd_speed_prior >> (i * 8));
if ((tmp < 0x01) || (tmp > 0x04)) { if ((tmp < 0x01) || (tmp > 0x04)) {
fake_para = true; valid_para = false;
break; 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; int i;
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
u8 tmp = (u8)(sd_current_prior >> (i * 8)); u8 tmp = (u8)(sd_current_prior >> (i * 8));
if (tmp > 0x03) { if (tmp > 0x03) {
fake_para = true; valid_para = false;
break; break;
} }
} }
return !fake_para; return valid_para;
} }
static int rts5208_init(struct rtsx_chip *chip) 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; 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; chip->sd_speed_prior = 0x01040203;
dev_dbg(rtsx_dev(chip), "sd_speed_prior = 0x%08x\n", dev_dbg(rtsx_dev(chip), "sd_speed_prior = 0x%08x\n",
chip->sd_speed_prior); 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; chip->sd_current_prior = 0x00010203;
dev_dbg(rtsx_dev(chip), "sd_current_prior = 0x%08x\n", dev_dbg(rtsx_dev(chip), "sd_current_prior = 0x%08x\n",