Skip to content

Commit

Permalink
cxgb4: 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: David S. Miller <davem@davemloft.net>
  • Loading branch information
YueHaibing authored and David S. Miller committed Nov 8, 2019
1 parent caee317 commit c8119fa
Showing 1 changed file with 6 additions and 11 deletions.
17 changes: 6 additions & 11 deletions drivers/net/ethernet/chelsio/cxgb4/cudbg_lib.c
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
*/

#include <linux/sort.h>
#include <linux/string.h>

#include "t4_regs.h"
#include "cxgb4.h"
Expand Down Expand Up @@ -776,24 +777,18 @@ static int cudbg_get_mem_region(struct adapter *padap,
struct cudbg_mem_desc *mem_desc)
{
u8 mc, found = 0;
u32 i, idx = 0;
int rc;
u32 idx = 0;
int rc, i;

rc = cudbg_meminfo_get_mem_index(padap, meminfo, mem_type, &mc);
if (rc)
return rc;

for (i = 0; i < ARRAY_SIZE(cudbg_region); i++) {
if (!strcmp(cudbg_region[i], region_name)) {
found = 1;
idx = i;
break;
}
}
if (!found)
i = match_string(cudbg_region, ARRAY_SIZE(cudbg_region), region_name);
if (i < 0)
return -EINVAL;

found = 0;
idx = i;
for (i = 0; i < meminfo->mem_c; i++) {
if (meminfo->mem[i].idx >= ARRAY_SIZE(cudbg_region))
continue; /* Skip holes */
Expand Down

0 comments on commit c8119fa

Please sign in to comment.