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 C2AFB2E3372; Tue, 29 Apr 2025 23:50: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=1745970640; cv=none; b=hOYmarzp7IsG4Xz+L+XrTSmHZbzubcXkEMdhrDrOyzmWVDXfESeFPsmzIIFpVQLbUwCixg2Y1fwKoB4Rc4zzrQreL3RMmFZsSfClMLhO9b2aCLAwLYOxiMq8eorUJXW/uqqFmVWbd8sB5wXBIIz9v1c7JcSTKhIEOcubOvI4xIw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745970640; c=relaxed/simple; bh=sdE0R1/X1K0Gxzc6kX2oq0qZ02hIV3EwRH4TKK6onP8=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=J96lUeLXGN5CQM4wjs0f2I26TQzorB7Z5Z6ou6IJSETbTKfsjQy5Bo9epUOp9xq0XwVIIXk1zBSIZJIRvdegALC3aKH94w7uT8yw8WPp3/0nM/1PBd1i7b30zaaG6Sf5rO8gYsw9u7xLWovr7+GZm4d5/TvvL8ds5VlRWfG9L5w= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=mnf4uT0Y; 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="mnf4uT0Y" Received: by smtp.kernel.org (Postfix) with ESMTPSA id BC750C4CEE3; Tue, 29 Apr 2025 23:50:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1745970640; bh=sdE0R1/X1K0Gxzc6kX2oq0qZ02hIV3EwRH4TKK6onP8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mnf4uT0YmktcLrMfThLz0iwmwSg7K1XLjomhC+nCaDBGQMn7xqFqNgXZjrVXhXCvl a4KctshzHBqLKQBI4XeyeuZn4q7B90KfYbzbHonPe215jRofBlmxUBfsd8onV+N7Mx BPkruU5wKXbOSRAGZJtnPjGcwhAv0d6C4R35xCdAPhPEJRyHS0BUM9N9Bv5TF/D21d Pvg+2GDiEED9D+W6PrpzwStGm8mYmM4tcqC4g+vEMfOtam+VavMGRrMmxI+lMcGHYn TSycRL/6hW50J1OpZudeGjaad2nbQqPfyRhXEKpt04siIWMC2yb1WquSjdyV7ztuyn kXLj3K0amfbtg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Marek Szyprowski , Andy Shevchenko , Jakub Kicinski , Sasha Levin , iommu@lists.linux.dev Subject: [PATCH AUTOSEL 6.14 17/39] dma-mapping: avoid potential unused data compilation warning Date: Tue, 29 Apr 2025 19:49:44 -0400 Message-Id: <20250429235006.536648-17-sashal@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250429235006.536648-1-sashal@kernel.org> References: <20250429235006.536648-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: iommu@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.14.4 Content-Transfer-Encoding: 8bit From: Marek Szyprowski [ Upstream commit c9b19ea63036fc537a69265acea1b18dabd1cbd3 ] When CONFIG_NEED_DMA_MAP_STATE is not defined, dma-mapping clients might report unused data compilation warnings for dma_unmap_*() calls arguments. Redefine macros for those calls to let compiler to notice that it is okay when the provided arguments are not used. Reported-by: Andy Shevchenko Suggested-by: Jakub Kicinski Signed-off-by: Marek Szyprowski Tested-by: Andy Shevchenko Link: https://lore.kernel.org/r/20250415075659.428549-1-m.szyprowski@samsung.com Signed-off-by: Sasha Levin --- include/linux/dma-mapping.h | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h index b79925b1c4333..85ab710ec0e72 100644 --- a/include/linux/dma-mapping.h +++ b/include/linux/dma-mapping.h @@ -629,10 +629,14 @@ static inline int dma_mmap_wc(struct device *dev, #else #define DEFINE_DMA_UNMAP_ADDR(ADDR_NAME) #define DEFINE_DMA_UNMAP_LEN(LEN_NAME) -#define dma_unmap_addr(PTR, ADDR_NAME) (0) -#define dma_unmap_addr_set(PTR, ADDR_NAME, VAL) do { } while (0) -#define dma_unmap_len(PTR, LEN_NAME) (0) -#define dma_unmap_len_set(PTR, LEN_NAME, VAL) do { } while (0) +#define dma_unmap_addr(PTR, ADDR_NAME) \ + ({ typeof(PTR) __p __maybe_unused = PTR; 0; }) +#define dma_unmap_addr_set(PTR, ADDR_NAME, VAL) \ + do { typeof(PTR) __p __maybe_unused = PTR; } while (0) +#define dma_unmap_len(PTR, LEN_NAME) \ + ({ typeof(PTR) __p __maybe_unused = PTR; 0; }) +#define dma_unmap_len_set(PTR, LEN_NAME, VAL) \ + do { typeof(PTR) __p __maybe_unused = PTR; } while (0) #endif #endif /* _LINUX_DMA_MAPPING_H */ -- 2.39.5