diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2012-05-21 14:49:18 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2012-05-31 14:56:48 +1000 |
| commit | 4d05ba85315e12d7372ecc5efb4c1767b16466ea (patch) | |
| tree | 5f0120d114fac0b2a09be8088b4a922af6d1ca0e | |
| parent | 1e2d01c3a6dff15cfd6d472a9983750321525c38 (diff) | |
SynapticsOverrideDefaults should take a priv pointer
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
| -rw-r--r-- | src/synaptics-x11.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/synaptics-x11.c b/src/synaptics-x11.c index 92341a5..31256de 100644 --- a/src/synaptics-x11.c +++ b/src/synaptics-x11.c @@ -570,9 +570,9 @@ fail: option_string); } -void SynapticsOverrideDefaults(InputInfoPtr pInfo, SynapticsParameters *pars) +void SynapticsOverrideDefaults(InputInfoPtr pInfo, SynapticsPrivate *priv) { - SynapticsPrivate *priv = pInfo->private; /* read-only */ + SynapticsParameters *pars = &priv->synpara; pointer opts = pInfo->options; /* read-only */ int width, height; @@ -693,7 +693,6 @@ static int SynapticsPreInit(InputDriverPtr drv, InputInfoPtr pInfo, int flags) { SynapticsPrivate *priv; - SynapticsParameters *pars; struct SynapticsX11 *x11; char *proto; char *device, *actual_device; @@ -712,7 +711,6 @@ SynapticsPreInit(InputDriverPtr drv, InputInfoPtr pInfo, int flags) priv->frontend_data = x11; x11->pInfo = pInfo; - pars = &priv->synpara; pInfo->type_name = XI_TOUCHPAD; pInfo->device_control = DeviceControl; pInfo->read_input = ReadInput; @@ -750,7 +748,7 @@ SynapticsPreInit(InputDriverPtr drv, InputInfoPtr pInfo, int flags) goto SetupProc_fail; } - SynapticsOverrideDefaults(pInfo, pars); + SynapticsOverrideDefaults(pInfo, priv); CalculateScalingCoeffs(priv); xf86ProcessCommonOptions(pInfo, pInfo->options); |