[PATCH] dma-mapping: Simplify get_dma_ops() control flow

From	Bjorn Helgaas <bhelgaas@google.com>
Newsgroups	linux.kernel
Subject	[PATCH] dma-mapping: Simplify get_dma_ops() control flow
Date	2016-05-31 23:30 +0200
Message-ID	<rEZoC-7SC-23@gated-at.bofh.it> (permalink)
Organization	linux.* mail to news gateway

Show all headers | View raw

Simplify code flow of get_dma_ops() by getting rid of several negations.
No functional change intended.

Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
---
 arch/x86/include/asm/dma-mapping.h |    9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/arch/x86/include/asm/dma-mapping.h b/arch/x86/include/asm/dma-mapping.h
index 3a27b93..96db8ea 100644
--- a/arch/x86/include/asm/dma-mapping.h
+++ b/arch/x86/include/asm/dma-mapping.h
@@ -30,14 +30,11 @@ extern struct dma_map_ops *dma_ops;
 
 static inline struct dma_map_ops *get_dma_ops(struct device *dev)
 {
-#ifndef CONFIG_X86_DEV_DMA_OPS
-	return dma_ops;
-#else
-	if (unlikely(!dev) || !dev->archdata.dma_ops)
-		return dma_ops;
-	else
+#ifdef CONFIG_X86_DEV_DMA_OPS
+	if (likely(dev) && dev->archdata.dma_ops)
 		return dev->archdata.dma_ops;
 #endif
+	return dma_ops;
 }
 
 bool arch_dma_alloc_attrs(struct device **dev, gfp_t *gfp);

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH] dma-mapping: Simplify get_dma_ops() control flow Bjorn Helgaas <bhelgaas@google.com> - 2016-05-31 23:30 +0200
  Re: [PATCH] dma-mapping: Simplify get_dma_ops() control flow Christoph Hellwig <hch@infradead.org> - 2016-06-01 10:00 +0200

csiph-web