From 57521e4e60c47b4683910d7f3cec42d1fa276810 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@redhat.com>
Date: Tue, 14 Oct 2008 16:14:13 +1030
Subject: Rename DragLockInit to DragLockPreInit, remove superfluous "return".
 (cherry picked from commit 088e0a175a4913bf827c1f7e19de09fdf987d347)

---
 src/draglock.c | 4 +---
 src/evdev.c    | 2 +-
 src/evdev.h    | 2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/draglock.c b/src/draglock.c
index 894aa8a..e1f037a 100644
--- a/src/draglock.c
+++ b/src/draglock.c
@@ -53,7 +53,7 @@ void EvdevDragLockLockButton(InputInfoPtr pInfo, unsigned int button);
 
 /* Setup and configuration code */
 void
-EvdevDragLockInit(InputInfoPtr pInfo)
+EvdevDragLockPreInit(InputInfoPtr pInfo)
 {
     EvdevPtr pEvdev = (EvdevPtr)pInfo->private;
     char *option_string = NULL;
@@ -247,8 +247,6 @@ EvdevDragLockInitProperty(DeviceIntPtr dev)
     XISetDevicePropertyDeletable(dev, prop_dlock, FALSE);
 
     XIRegisterPropertyHandler(dev, EvdevDragLockSetProperty, NULL, NULL);
-
-    return;
 }
 
 /**
diff --git a/src/evdev.c b/src/evdev.c
index b1470a3..73c20d8 100644
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -1359,7 +1359,7 @@ EvdevPreInit(InputDriverPtr drv, IDevPtr dev, int flags)
 
     EvdevMBEmuPreInit(pInfo);
     EvdevWheelEmuPreInit(pInfo);
-    EvdevDragLockInit(pInfo);
+    EvdevDragLockPreInit(pInfo);
 
     return pInfo;
 }
diff --git a/src/evdev.h b/src/evdev.h
index aa74481..c071971 100644
--- a/src/evdev.h
+++ b/src/evdev.h
@@ -148,6 +148,6 @@ BOOL EvdevWheelEmuFilterButton(InputInfoPtr pInfo, unsigned int button, int valu
 BOOL EvdevWheelEmuFilterMotion(InputInfoPtr pInfo, struct input_event *pEv);
 
 /* Draglock code */
-void EvdevDragLockInit(InputInfoPtr pInfo);
+void EvdevDragLockPreInit(InputInfoPtr pInfo);
 BOOL EvdevDragLockFilterEvent(InputInfoPtr pInfo, unsigned int button, int value);
 #endif
-- 
cgit v1.2.3