Purge pInfo from SynapticsTimerFunc

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

3 files changed, 7 insertions, 9 deletions

diff --git a/src/synaptics-x11.c b/src/synaptics-x11.c
index 8e6da4d..33b71c6 100644
--- a/src/synaptics-x11.c
+++ b/src/synaptics-x11.c
@@ -87,7 +87,7 @@ X11TimerFunc(OsTimerPtr timer, CARD32 now, pointer arg)
 
     sigstate = xf86BlockSIGIO();
 
-    delay = SynapticsTimerFunc(pInfo, now);
+    delay = SynapticsTimerFunc(priv, now);
 
     priv->timer_time = now;
     x11->timer = TimerSet(x11->timer, 0, delay, X11TimerFunc, pInfo);
@@ -98,13 +98,12 @@ X11TimerFunc(OsTimerPtr timer, CARD32 now, pointer arg)
 }
 
 void
-SetTimer(InputInfoPtr pInfo, unsigned int now, unsigned int delay)
+SetTimer(SynapticsPrivate *priv, unsigned int now, unsigned int delay)
 {
-    SynapticsPrivate *priv = (SynapticsPrivate *) (pInfo->private);
     struct SynapticsX11 *x11 = priv->frontend_data;
 
     priv->timer_time = GetTimeInMillis();
-    x11->timer = TimerSet(x11->timer, 0, delay, X11TimerFunc, pInfo);
+    x11->timer = TimerSet(x11->timer, 0, delay, X11TimerFunc, x11->pInfo);
 }
 
 /*
diff --git a/src/synaptics.c b/src/synaptics.c
index f48a338..20cf46f 100644
--- a/src/synaptics.c
+++ b/src/synaptics.c
@@ -725,9 +725,8 @@ is_inside_middlebutton_area(SynapticsParameters * para, int x, int y)
 }
 
 unsigned int
-SynapticsTimerFunc(InputInfoPtr pInfo, unsigned int now)
+SynapticsTimerFunc(SynapticsPrivate *priv, unsigned int now)
 {
-    SynapticsPrivate *priv = (SynapticsPrivate *) (pInfo->private);
     struct SynapticsHwState *hw = priv->local_hw_state;
     int delay;
 
@@ -788,7 +787,7 @@ ReadInput(InputInfoPtr pInfo)
     }
 
     if (newDelay)
-        SetTimer(pInfo, GetTimeInMillis(), delay);
+        SetTimer(priv, GetTimeInMillis(), delay);
 }
 
 static int
diff --git a/src/synaptics.h b/src/synaptics.h
index 76baff4..0ee3ca7 100644
--- a/src/synaptics.h
+++ b/src/synaptics.h
@@ -39,14 +39,14 @@ Bool DeviceOff(DeviceIntPtr);
 void DeviceCloseCore(SynapticsPrivate *priv);
 Bool SetDeviceAndProtocol(InputInfoPtr pInfo);
 void SetDefaultParameters(SynapticsPrivate *priv);
-void SetTimer(InputInfoPtr pInfo, unsigned int now, unsigned int delay);
+void SetTimer(SynapticsPrivate *priv, unsigned int now, unsigned int delay);
 void CalculateScalingCoeffs(SynapticsPrivate * priv);
 Bool QueryHardware(SynapticsPrivate *priv);
 struct SynapticsProtocolOperations* GetDeviceProtocolOps(SynapticsPrivate *priv,
                                                          const char *proto,
                                                          const char *device,
                                                          char **used_device);
-unsigned int SynapticsTimerFunc(InputInfoPtr pInfo, unsigned int now);
+unsigned int SynapticsTimerFunc(SynapticsPrivate *priv, unsigned int now);
 void InitDeviceProperties(InputInfoPtr pInfo);
 int SetProperty(DeviceIntPtr dev, Atom property, XIPropertyValuePtr prop, BOOL checkonly);
 void SynapticsButtonEvent(SynapticsPrivate *priv, int button, enum ButtonEventType press);