Skip to content

Commit 5f885f5

Browse files
Wang LiangNipaLocal
authored andcommitted
i40e: Replace sscanf() with kstrtoint() in i40e_dbg_netdev_ops_write()
Commit 9fcdb1c ("i40e: remove read access to debugfs files") introduced some checkpatch warnings like this: WARNING: Prefer kstrto<type> to single variable sscanf kernel-patches#240: FILE: drivers/net/ethernet/intel/i40e/i40e_debugfs.c:1655: + cnt = sscanf(&cmd_buf[11], "%i", &vsi_seid); WARNING: Prefer kstrto<type> to single variable sscanf kernel-patches#251: FILE: drivers/net/ethernet/intel/i40e/i40e_debugfs.c:1676: + cnt = sscanf(&cmd_buf[4], "%i", &vsi_seid); total: 0 errors, 2 warnings, 0 checks, 194 lines checked Function kstrtoint() provides better error detection, overflow protection, and consistent error handling than sscanf(). Replace sscanf() with kstrtoint() in i40e_dbg_netdev_ops_write() to silence the checkpatch warnings. Signed-off-by: Wang Liang <[email protected]> Signed-off-by: NipaLocal <nipa@local>
1 parent f9593ac commit 5f885f5

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

drivers/net/ethernet/intel/i40e/i40e_debugfs.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1604,7 +1604,7 @@ static ssize_t i40e_dbg_netdev_ops_write(struct file *filp,
16041604
int bytes_not_copied;
16051605
struct i40e_vsi *vsi;
16061606
int vsi_seid;
1607-
int i, cnt;
1607+
int i, ret;
16081608

16091609
/* don't allow partial writes */
16101610
if (*ppos != 0)
@@ -1629,9 +1629,9 @@ static ssize_t i40e_dbg_netdev_ops_write(struct file *filp,
16291629
if (strncmp(cmd_buf, "change_mtu", 10) == 0) {
16301630
int mtu;
16311631

1632-
cnt = sscanf(&cmd_buf[11], "%i %i",
1632+
ret = sscanf(&cmd_buf[11], "%i %i",
16331633
&vsi_seid, &mtu);
1634-
if (cnt != 2) {
1634+
if (ret != 2) {
16351635
dev_info(&pf->pdev->dev, "change_mtu <vsi_seid> <mtu>\n");
16361636
goto netdev_ops_write_done;
16371637
}
@@ -1652,8 +1652,8 @@ static ssize_t i40e_dbg_netdev_ops_write(struct file *filp,
16521652
}
16531653

16541654
} else if (strncmp(cmd_buf, "set_rx_mode", 11) == 0) {
1655-
cnt = sscanf(&cmd_buf[11], "%i", &vsi_seid);
1656-
if (cnt != 1) {
1655+
ret = kstrtoint(&cmd_buf[11], 0, &vsi_seid);
1656+
if (ret) {
16571657
dev_info(&pf->pdev->dev, "set_rx_mode <vsi_seid>\n");
16581658
goto netdev_ops_write_done;
16591659
}
@@ -1673,8 +1673,8 @@ static ssize_t i40e_dbg_netdev_ops_write(struct file *filp,
16731673
}
16741674

16751675
} else if (strncmp(cmd_buf, "napi", 4) == 0) {
1676-
cnt = sscanf(&cmd_buf[4], "%i", &vsi_seid);
1677-
if (cnt != 1) {
1676+
ret = kstrtoint(&cmd_buf[4], 0, &vsi_seid);
1677+
if (ret) {
16781678
dev_info(&pf->pdev->dev, "napi <vsi_seid>\n");
16791679
goto netdev_ops_write_done;
16801680
}

0 commit comments

Comments
 (0)