From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 446F1C433DF for ; Sat, 16 May 2020 10:11:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 29D812074D for ; Sat, 16 May 2020 10:11:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726226AbgEPKKA (ORCPT ); Sat, 16 May 2020 06:10:00 -0400 Received: from szxga04-in.huawei.com ([45.249.212.190]:4852 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1725792AbgEPKKA (ORCPT ); Sat, 16 May 2020 06:10:00 -0400 Received: from DGGEMS406-HUB.china.huawei.com (unknown [172.30.72.59]) by Forcepoint Email with ESMTP id 7DC1A5D1BEDB315367B0; Sat, 16 May 2020 18:09:49 +0800 (CST) Received: from [127.0.0.1] (10.166.215.237) by DGGEMS406-HUB.china.huawei.com (10.3.19.206) with Microsoft SMTP Server id 14.3.487.0; Sat, 16 May 2020 18:09:38 +0800 To: Christoph Hellwig , , , , CC: Shiyuan Hu , Hewenliang From: Yunfeng Ye Subject: [PATCH] dma-coherent: switch to bitmap_zalloc() in dma_init_coherent_memory() Message-ID: <1b02b07b-617e-bc5c-8619-7a46fba5a512@huawei.com> Date: Sat, 16 May 2020 18:09:38 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:60.0) Gecko/20100101 Thunderbird/60.6.1 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Language: en-US Content-Transfer-Encoding: 7bit X-Originating-IP: [10.166.215.237] X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Switch to bitmap_zalloc() to show clearly in dma_init_coherent_memory(). No functional change. Signed-off-by: Yunfeng Ye --- kernel/dma/coherent.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/kernel/dma/coherent.c b/kernel/dma/coherent.c index 2a0c4985f38e..794b31e61ca0 100644 --- a/kernel/dma/coherent.c +++ b/kernel/dma/coherent.c @@ -44,7 +44,6 @@ static int dma_init_coherent_memory(phys_addr_t phys_addr, struct dma_coherent_mem *dma_mem = NULL; void *mem_base = NULL; int pages = size >> PAGE_SHIFT; - int bitmap_size = BITS_TO_LONGS(pages) * sizeof(long); int ret; if (!size) { @@ -62,7 +61,7 @@ static int dma_init_coherent_memory(phys_addr_t phys_addr, ret = -ENOMEM; goto out; } - dma_mem->bitmap = kzalloc(bitmap_size, GFP_KERNEL); + dma_mem->bitmap = bitmap_zalloc(pages, GFP_KERNEL); if (!dma_mem->bitmap) { ret = -ENOMEM; goto out; @@ -90,7 +89,7 @@ static void dma_release_coherent_memory(struct dma_coherent_mem *mem) return; memunmap(mem->virt_base); - kfree(mem->bitmap); + bitmap_free(mem->bitmap); kfree(mem); } -- 1.8.3.1