xserver: Branch 'master'

[GitLab Mirror]

 hw/xfree86/drivers/modesetting/driver.c |    8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

New commits:
commit e97adda52d66e8165fdb8d97146e3f1553396cb4
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date:   Fri Jul 19 17:04:34 2024 +0200

    xfree86: modesetting: merge FreeRec() into FreeScreen()
    
    No need to have one function doing nothing more than calling another one
    with the same prototype.
    
    Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1611>

diff --git a/hw/xfree86/drivers/modesetting/driver.c b/hw/xfree86/drivers/modesetting/driver.c
index 05e9e459f..3a06fd95d 100644
--- a/hw/xfree86/drivers/modesetting/driver.c
+++ b/hw/xfree86/drivers/modesetting/driver.c
@@ -1023,7 +1023,7 @@ ms_unwrap_property_requests(ScrnInfoPtr scrn)
 }
 
 static void
-FreeRec(ScrnInfoPtr pScrn)
+FreeScreen(ScrnInfoPtr pScrn)
 {
     modesettingPtr ms;
 
@@ -2214,12 +2214,6 @@ AdjustFrame(ScrnInfoPtr pScrn, int x, int y)
     drmmode_adjust_frame(pScrn, &ms->drmmode, x, y);
 }
 
-static void
-FreeScreen(ScrnInfoPtr pScrn)
-{
-    FreeRec(pScrn);
-}
-
 static void
 LeaveVT(ScrnInfoPtr pScrn)
 {