]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
net: ena: remove devm from ethtool
authorRosen Penev <rosenp@gmail.com>
Fri, 1 Nov 2024 21:48:27 +0000 (14:48 -0700)
committerJakub Kicinski <kuba@kernel.org>
Tue, 5 Nov 2024 02:21:52 +0000 (18:21 -0800)
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>
drivers/net/ethernet/amazon/ena/ena_ethtool.c

index 60fb35ec4b15acbbc4904b77406b6ec1f2c6d885..a3c934c3de71d3fc4b5274255f4d05374e50e803 100644 (file)
@@ -1129,22 +1129,18 @@ static void ena_dump_stats_ex(struct ena_adapter *adapter, u8 *buf)
                return;
        }
 
-       strings_buf = devm_kcalloc(&adapter->pdev->dev,
-                                  ETH_GSTRING_LEN, strings_num,
-                                  GFP_ATOMIC);
+       strings_buf = kcalloc(strings_num, ETH_GSTRING_LEN, GFP_ATOMIC);
        if (!strings_buf) {
                netif_err(adapter, drv, netdev,
                          "Failed to allocate strings_buf\n");
                return;
        }
 
-       data_buf = devm_kcalloc(&adapter->pdev->dev,
-                               strings_num, sizeof(u64),
-                               GFP_ATOMIC);
+       data_buf = kcalloc(strings_num, sizeof(u64), GFP_ATOMIC);
        if (!data_buf) {
                netif_err(adapter, drv, netdev,
                          "Failed to allocate data buf\n");
-               devm_kfree(&adapter->pdev->dev, strings_buf);
+               kfree(strings_buf);
                return;
        }
 
@@ -1166,8 +1162,8 @@ static void ena_dump_stats_ex(struct ena_adapter *adapter, u8 *buf)
                                  strings_buf + i * ETH_GSTRING_LEN,
                                  data_buf[i]);
 
-       devm_kfree(&adapter->pdev->dev, strings_buf);
-       devm_kfree(&adapter->pdev->dev, data_buf);
+       kfree(strings_buf);
+       kfree(data_buf);
 }
 
 void ena_dump_stats_to_buf(struct ena_adapter *adapter, u8 *buf)