[PATCH 05/12] intel: Use '||' for the boolean or

Damien Lespiau damien.lespiau at intel.com
Thu Mar 5 08:20:13 PST 2015


While the bitwise operator should do the right thing here, it's probably
better to use the logical or here, at least to not cause a 'wtf' when
reading the code.

At the same time, get rid of unnecessary '()'.

Signed-off-by: Damien Lespiau <damien.lespiau at intel.com>
---
 intel/intel_bufmgr_gem.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/intel/intel_bufmgr_gem.c b/intel/intel_bufmgr_gem.c
index 72a6ab1..8570a30 100644
--- a/intel/intel_bufmgr_gem.c
+++ b/intel/intel_bufmgr_gem.c
@@ -3494,8 +3494,8 @@ drm_intel_bufmgr_gem_init(int fd, int batch_size)
 		/* Kernel does not supports HAS_LLC query, fallback to GPU
 		 * generation detection and assume that we have LLC on GEN6/7
 		 */
-		bufmgr_gem->has_llc = (IS_GEN6(bufmgr_gem->pci_device) |
-				IS_GEN7(bufmgr_gem->pci_device));
+		bufmgr_gem->has_llc = IS_GEN6(bufmgr_gem->pci_device) ||
+				      IS_GEN7(bufmgr_gem->pci_device);
 	} else
 		bufmgr_gem->has_llc = *gp.value;
 
-- 
1.8.3.1



More information about the dri-devel mailing list