Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Rosen Penev and committed by
Jakub Kicinski
d2068805 18ec5491

+5 -9
+5 -9
drivers/net/ethernet/amazon/ena/ena_ethtool.c
··· 1129 1129 return; 1130 1130 } 1131 1131 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); 1135 1133 if (!strings_buf) { 1136 1134 netif_err(adapter, drv, netdev, 1137 1135 "Failed to allocate strings_buf\n"); 1138 1136 return; 1139 1137 } 1140 1138 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); 1144 1140 if (!data_buf) { 1145 1141 netif_err(adapter, drv, netdev, 1146 1142 "Failed to allocate data buf\n"); 1147 - devm_kfree(&adapter->pdev->dev, strings_buf); 1143 + kfree(strings_buf); 1148 1144 return; 1149 1145 } 1150 1146 ··· 1162 1166 strings_buf + i * ETH_GSTRING_LEN, 1163 1167 data_buf[i]); 1164 1168 1165 - devm_kfree(&adapter->pdev->dev, strings_buf); 1166 - devm_kfree(&adapter->pdev->dev, data_buf); 1169 + kfree(strings_buf); 1170 + kfree(data_buf); 1167 1171 } 1168 1172 1169 1173 void ena_dump_stats_to_buf(struct ena_adapter *adapter, u8 *buf)