From 99e55f1b955e2db442184756fcd8b95791fd71de Mon Sep 17 00:00:00 2001
From: Roman Gilg <subdiff@gmail.com>
Date: Mon, 27 May 2019 22:32:22 +0200
Subject: [PATCH] present: Adjust timings with value arguments
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

We can use value arguments instead of pointers when adjusting the timings
by returning the adjusted value. This improves the readability.

Signed-off-by: Roman Gilg <subdiff@gmail.com>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
---
 present/present.c      | 25 +++++++++++++------------
 present/present_priv.h |  8 ++++----
 present/present_scmd.c | 10 +++++-----
 present/present_wnmd.c | 10 +++++-----
 4 files changed, 27 insertions(+), 26 deletions(-)

diff --git a/present/present.c b/present/present.c
index 3eddb7434..1a2163cdc 100644
--- a/present/present.c
+++ b/present/present.c
@@ -157,31 +157,32 @@ present_can_window_flip(WindowPtr window)
     return screen_priv->can_window_flip(window);
 }
 
-void
-present_adjust_timings(uint32_t options,
-                       uint64_t *crtc_msc,
-                       uint64_t *target_msc,
+uint64_t
+present_get_target_msc(uint32_t options,
+                       uint64_t crtc_msc,
+                       uint64_t target_msc,
                        uint64_t divisor,
                        uint64_t remainder)
 {
     /* Adjust target_msc to match modulus
      */
-    if (msc_is_equal_or_after(*crtc_msc, *target_msc)) {
+    if (msc_is_equal_or_after(crtc_msc, target_msc)) {
         if (divisor != 0) {
-            *target_msc = *crtc_msc - (*crtc_msc % divisor) + remainder;
+            target_msc = crtc_msc - (crtc_msc % divisor) + remainder;
             if (options & PresentOptionAsync) {
-                if (msc_is_after(*crtc_msc, *target_msc))
-                    *target_msc += divisor;
+                if (msc_is_after(crtc_msc, target_msc))
+                    target_msc += divisor;
             } else {
-                if (msc_is_equal_or_after(*crtc_msc, *target_msc))
-                    *target_msc += divisor;
+                if (msc_is_equal_or_after(crtc_msc, target_msc))
+                    target_msc += divisor;
             }
         } else {
-            *target_msc = *crtc_msc;
+            target_msc = crtc_msc;
             if (!(options & PresentOptionAsync))
-                (*target_msc)++;
+                (target_msc)++;
         }
     }
+    return target_msc;
 }
 
 int
diff --git a/present/present_priv.h b/present/present_priv.h
index 5849b9e0b..3205d033d 100644
--- a/present/present_priv.h
+++ b/present/present_priv.h
@@ -279,10 +279,10 @@ present_set_tree_pixmap(WindowPtr window,
                         PixmapPtr expected,
                         PixmapPtr pixmap);
 
-void
-present_adjust_timings(uint32_t options,
-                       uint64_t *crtc_msc,
-                       uint64_t *target_msc,
+uint64_t
+present_get_target_msc(uint32_t options,
+                       uint64_t crtc_msc,
+                       uint64_t target_msc,
                        uint64_t divisor,
                        uint64_t remainder);
 
diff --git a/present/present_scmd.c b/present/present_scmd.c
index 8417d0925..88c6ebbf7 100644
--- a/present/present_scmd.c
+++ b/present/present_scmd.c
@@ -690,11 +690,11 @@ present_scmd_pixmap(WindowPtr window,
         window_priv->msc = crtc_msc;
     }
 
-    present_adjust_timings(options,
-                           &crtc_msc,
-                           &target_msc,
-                           divisor,
-                           remainder);
+    target_msc = present_get_target_msc(options,
+                                        crtc_msc,
+                                        target_msc,
+                                        divisor,
+                                        remainder);
 
     /*
      * Look for a matching presentation already on the list and
diff --git a/present/present_wnmd.c b/present/present_wnmd.c
index 82bae4022..f09e320aa 100644
--- a/present/present_wnmd.c
+++ b/present/present_wnmd.c
@@ -582,11 +582,11 @@ present_wnmd_pixmap(WindowPtr window,
         window_priv->msc = crtc_msc;
     }
 
-    present_adjust_timings(options,
-                           &crtc_msc,
-                           &target_msc,
-                           divisor,
-                           remainder);
+    target_msc = present_get_target_msc(options,
+                                        crtc_msc,
+                                        target_msc,
+                                        divisor,
+                                        remainder);
 
     /*
      * Look for a matching presentation already on the list...