Skip to content

Commit

Permalink
mtd: rawnand: macronix: Use match_string() helper to simplify the code
Browse files Browse the repository at this point in the history
match_string() returns the array index of a matching string.
Use it instead of the open-coded implementation.

Signed-off-by: YueHaibing <yuehaibing@huawei.com>
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
  • Loading branch information
YueHaibing authored and Miquel Raynal committed Jan 21, 2020
1 parent f33113b commit db7b6ae
Showing 1 changed file with 4 additions and 7 deletions.
11 changes: 4 additions & 7 deletions drivers/mtd/nand/raw/nand_macronix.c
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ static void macronix_nand_onfi_init(struct nand_chip *chip)
*/
static void macronix_nand_fix_broken_get_timings(struct nand_chip *chip)
{
unsigned int i;
int i;
static const char * const broken_get_timings[] = {
"MX30LF1G18AC",
"MX30LF1G28AC",
Expand All @@ -80,12 +80,9 @@ static void macronix_nand_fix_broken_get_timings(struct nand_chip *chip)
if (!chip->parameters.supports_set_get_features)
return;

for (i = 0; i < ARRAY_SIZE(broken_get_timings); i++) {
if (!strcmp(broken_get_timings[i], chip->parameters.model))
break;
}

if (i == ARRAY_SIZE(broken_get_timings))
i = match_string(broken_get_timings, ARRAY_SIZE(broken_get_timings),
chip->parameters.model);
if (i < 0)
return;

bitmap_clear(chip->parameters.get_feature_list,
Expand Down

0 comments on commit db7b6ae

Please sign in to comment.