From mboxrd@z Thu Jan 1 00:00:00 1970 From: YueHaibing Subject: [PATCH net-next 3/6] net: neterion: use pci_zalloc_consistent Date: Tue, 5 Jun 2018 20:28:48 +0800 Message-ID: <20180605122851.23912-4-yuehaibing@huawei.com> References: <20180605122851.23912-1-yuehaibing@huawei.com> Mime-Version: 1.0 Content-Type: text/plain Cc: , , , , , , , , , YueHaibing To: Return-path: In-Reply-To: <20180605122851.23912-1-yuehaibing@huawei.com> Sender: linux-kernel-owner@vger.kernel.org List-Id: netdev.vger.kernel.org use pci_zalloc_consistent to remove unnecessary memset. Signed-off-by: YueHaibing --- drivers/net/ethernet/neterion/s2io.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/drivers/net/ethernet/neterion/s2io.c b/drivers/net/ethernet/neterion/s2io.c index b8983e7..4e8a2fd 100644 --- a/drivers/net/ethernet/neterion/s2io.c +++ b/drivers/net/ethernet/neterion/s2io.c @@ -733,8 +733,8 @@ static int init_shared_mem(struct s2io_nic *nic) rx_blocks = &ring->rx_blocks[j]; size = SIZE_OF_BLOCK; /* size is always page size */ - tmp_v_addr = pci_alloc_consistent(nic->pdev, size, - &tmp_p_addr); + tmp_v_addr = pci_zalloc_consistent(nic->pdev, size, + &tmp_p_addr); if (tmp_v_addr == NULL) { /* * In case of failure, free_shared_mem() @@ -746,7 +746,6 @@ static int init_shared_mem(struct s2io_nic *nic) return -ENOMEM; } mem_allocated += size; - memset(tmp_v_addr, 0, size); size = sizeof(struct rxd_info) * rxd_count[nic->rxd_mode]; @@ -835,8 +834,8 @@ static int init_shared_mem(struct s2io_nic *nic) /* Allocation and initialization of Statistics block */ size = sizeof(struct stat_block); mac_control->stats_mem = - pci_alloc_consistent(nic->pdev, size, - &mac_control->stats_mem_phy); + pci_zalloc_consistent(nic->pdev, size, + &mac_control->stats_mem_phy); if (!mac_control->stats_mem) { /* @@ -851,7 +850,6 @@ static int init_shared_mem(struct s2io_nic *nic) tmp_v_addr = mac_control->stats_mem; mac_control->stats_info = tmp_v_addr; - memset(tmp_v_addr, 0, size); DBG_PRINT(INIT_DBG, "%s: Ring Mem PHY: 0x%llx\n", dev_name(&nic->pdev->dev), (unsigned long long)tmp_p_addr); mac_control->stats_info->sw_stat.mem_allocated += mem_allocated; -- 2.7.0