Skip to content

Commit d206880

Browse files
nehebkuba-moo
authored andcommitted
net: ena: remove devm from ethtool
There's no need for devm bloat here. In addition, these are freed right before the function exits. Also swapped kcalloc order for consistency. Signed-off-by: Rosen Penev <rosenp@gmail.com> Reviewed-by: Shay Agroskin <shayagr@amazon.com> Link: https://patch.msgid.link/20241101214828.289752-2-rosenp@gmail.com Signed-off-by: Jakub Kicinski <kuba@kernel.org>
1 parent 18ec549 commit d206880

File tree

1 file changed

+5
-9
lines changed

1 file changed

+5
-9
lines changed

drivers/net/ethernet/amazon/ena/ena_ethtool.c

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1129,22 +1129,18 @@ static void ena_dump_stats_ex(struct ena_adapter *adapter, u8 *buf)
11291129
return;
11301130
}
11311131

1132-
strings_buf = devm_kcalloc(&adapter->pdev->dev,
1133-
ETH_GSTRING_LEN, strings_num,
1134-
GFP_ATOMIC);
1132+
strings_buf = kcalloc(strings_num, ETH_GSTRING_LEN, GFP_ATOMIC);
11351133
if (!strings_buf) {
11361134
netif_err(adapter, drv, netdev,
11371135
"Failed to allocate strings_buf\n");
11381136
return;
11391137
}
11401138

1141-
data_buf = devm_kcalloc(&adapter->pdev->dev,
1142-
strings_num, sizeof(u64),
1143-
GFP_ATOMIC);
1139+
data_buf = kcalloc(strings_num, sizeof(u64), GFP_ATOMIC);
11441140
if (!data_buf) {
11451141
netif_err(adapter, drv, netdev,
11461142
"Failed to allocate data buf\n");
1147-
devm_kfree(&adapter->pdev->dev, strings_buf);
1143+
kfree(strings_buf);
11481144
return;
11491145
}
11501146

@@ -1166,8 +1162,8 @@ static void ena_dump_stats_ex(struct ena_adapter *adapter, u8 *buf)
11661162
strings_buf + i * ETH_GSTRING_LEN,
11671163
data_buf[i]);
11681164

1169-
devm_kfree(&adapter->pdev->dev, strings_buf);
1170-
devm_kfree(&adapter->pdev->dev, data_buf);
1165+
kfree(strings_buf);
1166+
kfree(data_buf);
11711167
}
11721168

11731169
void ena_dump_stats_to_buf(struct ena_adapter *adapter, u8 *buf)

0 commit comments

Comments
 (0)