hc
2023-12-11 d2ccde1c8e90d38cee87a1b0309ad2827f3fd30d
kernel/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c
....@@ -1,8 +1,7 @@
1
+// SPDX-License-Identifier: GPL-2.0-only
12 /*
23 * QLogic qlcnic NIC Driver
34 * Copyright (c) 2009-2013 QLogic Corporation
4
- *
5
- * See LICENSE.qlcnic for copyright and licensing details.
65 */
76
87 #include "qlcnic.h"
....@@ -434,14 +433,14 @@
434433 *(tx_ring->hw_consumer) = 0;
435434
436435 rq_size = SIZEOF_HOSTRQ_TX(struct qlcnic_hostrq_tx_ctx);
437
- rq_addr = dma_zalloc_coherent(&adapter->pdev->dev, rq_size,
438
- &rq_phys_addr, GFP_KERNEL);
436
+ rq_addr = dma_alloc_coherent(&adapter->pdev->dev, rq_size,
437
+ &rq_phys_addr, GFP_KERNEL);
439438 if (!rq_addr)
440439 return -ENOMEM;
441440
442441 rsp_size = SIZEOF_CARDRSP_TX(struct qlcnic_cardrsp_tx_ctx);
443
- rsp_addr = dma_zalloc_coherent(&adapter->pdev->dev, rsp_size,
444
- &rsp_phys_addr, GFP_KERNEL);
442
+ rsp_addr = dma_alloc_coherent(&adapter->pdev->dev, rsp_size,
443
+ &rsp_phys_addr, GFP_KERNEL);
445444 if (!rsp_addr) {
446445 err = -ENOMEM;
447446 goto out_free_rq;
....@@ -855,8 +854,8 @@
855854 struct qlcnic_cmd_args cmd;
856855 size_t nic_size = sizeof(struct qlcnic_info_le);
857856
858
- nic_info_addr = dma_zalloc_coherent(&adapter->pdev->dev, nic_size,
859
- &nic_dma_t, GFP_KERNEL);
857
+ nic_info_addr = dma_alloc_coherent(&adapter->pdev->dev, nic_size,
858
+ &nic_dma_t, GFP_KERNEL);
860859 if (!nic_info_addr)
861860 return -ENOMEM;
862861
....@@ -909,8 +908,8 @@
909908 if (adapter->ahw->op_mode != QLCNIC_MGMT_FUNC)
910909 return err;
911910
912
- nic_info_addr = dma_zalloc_coherent(&adapter->pdev->dev, nic_size,
913
- &nic_dma_t, GFP_KERNEL);
911
+ nic_info_addr = dma_alloc_coherent(&adapter->pdev->dev, nic_size,
912
+ &nic_dma_t, GFP_KERNEL);
914913 if (!nic_info_addr)
915914 return -ENOMEM;
916915
....@@ -964,8 +963,8 @@
964963 void *pci_info_addr;
965964 int err = 0, i;
966965
967
- pci_info_addr = dma_zalloc_coherent(&adapter->pdev->dev, pci_size,
968
- &pci_info_dma_t, GFP_KERNEL);
966
+ pci_info_addr = dma_alloc_coherent(&adapter->pdev->dev, pci_size,
967
+ &pci_info_dma_t, GFP_KERNEL);
969968 if (!pci_info_addr)
970969 return -ENOMEM;
971970
....@@ -1078,8 +1077,8 @@
10781077 return -EIO;
10791078 }
10801079
1081
- stats_addr = dma_zalloc_coherent(&adapter->pdev->dev, stats_size,
1082
- &stats_dma_t, GFP_KERNEL);
1080
+ stats_addr = dma_alloc_coherent(&adapter->pdev->dev, stats_size,
1081
+ &stats_dma_t, GFP_KERNEL);
10831082 if (!stats_addr)
10841083 return -ENOMEM;
10851084
....@@ -1134,8 +1133,8 @@
11341133 if (mac_stats == NULL)
11351134 return -ENOMEM;
11361135
1137
- stats_addr = dma_zalloc_coherent(&adapter->pdev->dev, stats_size,
1138
- &stats_dma_t, GFP_KERNEL);
1136
+ stats_addr = dma_alloc_coherent(&adapter->pdev->dev, stats_size,
1137
+ &stats_dma_t, GFP_KERNEL);
11391138 if (!stats_addr)
11401139 return -ENOMEM;
11411140