Merge tag 'drm-next-2022-10-14' of git://anongit.freedesktop.org/drm/drm

[platform/kernel/linux-rpi.git] / include / math-emu / op-2.h

diff --git a/include/math-emu/op-2.h b/include/math-emu/op-2.h
index 13a374f..244522b 100644 (file)
--- a/include/math-emu/op-2.h
+++ b/include/math-emu/op-2.h
@@ -567,16 +567,13 @@
  */
 
 #define _FP_FRAC_ASSEMBLE_2(r, X, rsize)       \
-  do {                                         \
-    if (rsize <= _FP_W_TYPE_SIZE)              \
-      r = X##_f0;                              \
-    else                                       \
-      {                                                \
-       r = X##_f1;                             \
-       r <<= _FP_W_TYPE_SIZE;                  \
-       r += X##_f0;                            \
-      }                                                \
-  } while (0)
+       (void) (((rsize) <= _FP_W_TYPE_SIZE)    \
+               ? ({ (r) = X##_f0; })           \
+               : ({                            \
+                    (r) = X##_f1;              \
+                    (r) <<= _FP_W_TYPE_SIZE;   \
+                    (r) += X##_f0;             \
+                   }))
 
 #define _FP_FRAC_DISASSEMBLE_2(X, r, rsize)                            \
   do {                                                                 \