From: Heiner Kallweit <hkallweit1@gmail.com>
Date: Fri, 26 Mar 2021 21:03:05 +0000 (+0100)
Subject: dma-mapping: add unlikely hint to error path in dma_mapping_error
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=a7f3d3d3600c8ed119eb0d2483de0062ce2e3707;p=linux.git

dma-mapping: add unlikely hint to error path in dma_mapping_error

Zillions of drivers use the unlikely() hint when checking the result of
dma_mapping_error(). This is an inline function anyway, so we can move
the hint into the function and remove it from drivers over time.

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Reviewed-by: Robin Murphy <robin.murphy@arm.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
---

diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h
index e9d19b974f267..183e7103a66df 100644
--- a/include/linux/dma-mapping.h
+++ b/include/linux/dma-mapping.h
@@ -95,7 +95,7 @@ static inline int dma_mapping_error(struct device *dev, dma_addr_t dma_addr)
 {
 	debug_dma_mapping_error(dev, dma_addr);
 
-	if (dma_addr == DMA_MAPPING_ERROR)
+	if (unlikely(dma_addr == DMA_MAPPING_ERROR))
 		return -ENOMEM;
 	return 0;
 }