From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id AFD3C3B6C1F; Tue, 12 May 2026 09:06:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778576800; cv=none; b=jF7J0tG6UlZj4dOC7mJ9cLPMDhT4UBhRT7GXbZnaLAlFYDP5EYvkxtzA8penqjr/ms6BV9mayRqluu0QinnRaaA+fWGB7rbAf93mbvHM3sVQR5IifeS94aWNEEfV3DRTotP7ktdOOrOh3p/YBgfMYaRaCz8vPMS639ra+SJEFik= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778576800; c=relaxed/simple; bh=mTlzwGmKaksgYc3F/GyUj4XB9AG9GATAkfL4j43fQ40=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=bANJKA6R8mPj0DAnRM39AW9ZBVfNybeR1QfSUBFA19tDfWodKuP2qpTRupai8sK/cLy0bYMLgWXCjuxUxY61L2tRcbTqTBNV148l0MY6OFL7Gnexnny+gFGhcNakvsc6IQo1bCrKSPmqUMOhDMK0tTuV68b9rrlqmF/N72tto20= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Gg9NhAp7; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="Gg9NhAp7" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3AC84C2BCF7; Tue, 12 May 2026 09:06:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1778576799; bh=mTlzwGmKaksgYc3F/GyUj4XB9AG9GATAkfL4j43fQ40=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Gg9NhAp7QAL+VjZbnyz/0jlu7gA+E880rsW1LbQ4Tm+kjB/qLh83dBTqQCogFkMnk 6ldiTPnH1BZAHckzOmx/zFVXOvdywPpPf75pIgEpalHO5cqsgAyIFMRGo1Pp+77GEO MM0gflFTCnuDTyh7C+CWAabFjFk801in1C2uepCZveaoORNYDG2BAqk4lzaTwLJQO6 msRKi6DGIBt9MapjDJ/C6gK56qwGC2e+Q3E3tpjbe3FWjBA4z4aPUCiQI43o+zkFJu mUPkM5VjW/y2kXSQuOj2NG74UZEsprayRa/8m7pL2NMYQAR7xaHdfQY+GzIyu7EPvK ce/+WEjgnU5BQ== From: "Aneesh Kumar K.V (Arm)" To: iommu@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-coco@lists.linux.dev Cc: "Aneesh Kumar K.V (Arm)" , Robin Murphy , Marek Szyprowski , Will Deacon , Marc Zyngier , Steven Price , Suzuki K Poulose , Catalin Marinas , Jiri Pirko , Jason Gunthorpe , Mostafa Saleh , Petr Tesarik , Alexey Kardashevskiy , Dan Williams , Xu Yilun , linuxppc-dev@lists.ozlabs.org, linux-s390@vger.kernel.org, Madhavan Srinivasan , Michael Ellerman , Nicholas Piggin , "Christophe Leroy (CS GROUP)" , Alexander Gordeev , Gerald Schaefer , Heiko Carstens , Vasily Gorbik , Christian Borntraeger , Sven Schnelle , x86@kernel.org Subject: [PATCH v4 11/13] dma-direct: rename ret to cpu_addr in alloc helpers Date: Tue, 12 May 2026 14:34:06 +0530 Message-ID: <20260512090408.794195-12-aneesh.kumar@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260512090408.794195-1-aneesh.kumar@kernel.org> References: <20260512090408.794195-1-aneesh.kumar@kernel.org> Precedence: bulk X-Mailing-List: linux-s390@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit ret in dma_direct_alloc() and dma_direct_alloc_pages() holds the returned CPU mapping, not a generic return value. Rename it to cpu_addr and update the remaining uses to match. This makes the allocation paths easier to follow and keeps the local naming consistent with what the variable actually represents. Signed-off-by: Aneesh Kumar K.V (Arm) --- kernel/dma/direct.c | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/kernel/dma/direct.c b/kernel/dma/direct.c index 1e9f9ff7b9d3..902008e40ea1 100644 --- a/kernel/dma/direct.c +++ b/kernel/dma/direct.c @@ -212,7 +212,7 @@ void *dma_direct_alloc(struct device *dev, size_t size, bool mark_mem_decrypt = false; bool allow_highmem = true; struct page *page; - void *ret; + void *cpu_addr; /* * DMA_ATTR_CC_SHARED is not a caller-visible dma_alloc_*() @@ -326,34 +326,33 @@ void *dma_direct_alloc(struct device *dev, size_t size, arch_dma_prep_coherent(page, size); /* create a coherent mapping */ - ret = dma_common_contiguous_remap(page, size, prot, - __builtin_return_address(0)); - if (!ret) + cpu_addr = dma_common_contiguous_remap(page, size, prot, + __builtin_return_address(0)); + if (!cpu_addr) goto out_encrypt_pages; } else { - ret = page_address(page); + cpu_addr = page_address(page); } - memset(ret, 0, size); + memset(cpu_addr, 0, size); if (set_uncached) { void *uncached_cpu_addr; arch_dma_prep_coherent(page, size); - uncached_cpu_addr = arch_dma_set_uncached(ret, size); + uncached_cpu_addr = arch_dma_set_uncached(cpu_addr, size); if (IS_ERR(uncached_cpu_addr)) goto out_free_remap_pages; - ret = uncached_cpu_addr; + cpu_addr = uncached_cpu_addr; } *dma_handle = phys_to_dma_direct(dev, page_to_phys(page), !!(attrs & DMA_ATTR_CC_SHARED)); - return ret; - + return cpu_addr; out_free_remap_pages: if (remap) - dma_common_free_remap(ret, size); + dma_common_free_remap(cpu_addr, size); out_encrypt_pages: if (mark_mem_decrypt && @@ -437,7 +436,7 @@ struct page *dma_direct_alloc_pages(struct device *dev, size_t size, { unsigned long attrs = 0; struct page *page; - void *ret; + void *cpu_addr; if (force_dma_unencrypted(dev)) attrs |= DMA_ATTR_CC_SHARED; @@ -455,7 +454,7 @@ struct page *dma_direct_alloc_pages(struct device *dev, size_t size, swiotlb_free(dev, page, size); return NULL; } - ret = page_address(page); + cpu_addr = page_address(page); goto setup_page; } @@ -463,11 +462,11 @@ struct page *dma_direct_alloc_pages(struct device *dev, size_t size, if (!page) return NULL; - ret = page_address(page); - if ((attrs & DMA_ATTR_CC_SHARED) && dma_set_decrypted(dev, ret, size)) + cpu_addr = page_address(page); + if ((attrs & DMA_ATTR_CC_SHARED) && dma_set_decrypted(dev, cpu_addr, size)) goto out_leak_pages; setup_page: - memset(ret, 0, size); + memset(cpu_addr, 0, size); *dma_handle = phys_to_dma_direct(dev, page_to_phys(page), !!(attrs & DMA_ATTR_CC_SHARED)); return page; -- 2.43.0