From: Francis Laniel <[email protected]> The two functions indicates if a string begins with a given prefix. The only difference is that strstarts() returns a bool while str_has_prefix() returns the length of the prefix if the string begins with it or 0 otherwise.
Signed-off-by: Francis Laniel <[email protected]> --- arch/mips/bcm47xx/board.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/mips/bcm47xx/board.c b/arch/mips/bcm47xx/board.c index 35266a70e22a..c21a15b581f6 100644 --- a/arch/mips/bcm47xx/board.c +++ b/arch/mips/bcm47xx/board.c @@ -243,7 +243,7 @@ static __init const struct bcm47xx_board_type *bcm47xx_board_get_nvram(void) if (bcm47xx_nvram_getenv("hardware_version", buf1, sizeof(buf1)) >= 0) { for (e1 = bcm47xx_board_list_hardware_version; e1->value1; e1++) { - if (strstarts(buf1, e1->value1)) + if (str_has_prefix(buf1, e1->value1)) return &e1->board; } } @@ -251,7 +251,7 @@ static __init const struct bcm47xx_board_type *bcm47xx_board_get_nvram(void) if (bcm47xx_nvram_getenv("hardware_version", buf1, sizeof(buf1)) >= 0 && bcm47xx_nvram_getenv("boardnum", buf2, sizeof(buf2)) >= 0) { for (e2 = bcm47xx_board_list_hw_version_num; e2->value1; e2++) { - if (!strstarts(buf1, e2->value1) && + if (!str_has_prefix(buf1, e2->value1) && !strcmp(buf2, e2->value2)) return &e2->board; } -- 2.20.1
