The latter didn't do anything but call wcmRegisterX11Devices, so we might as well skip this step.
Signed-off-by: Peter Hutterer <[email protected]> --- src/xf86Wacom.c | 14 ++++---------- 1 files changed, 4 insertions(+), 10 deletions(-) diff --git a/src/xf86Wacom.c b/src/xf86Wacom.c index 170ee9a..6244ec0 100644 --- a/src/xf86Wacom.c +++ b/src/xf86Wacom.c @@ -391,12 +391,13 @@ static void wcmInitialToolSize(InputInfoPtr pInfo) } /***************************************************************************** - * wcmRegisterX11Devices -- - * Register the X11 input devices with X11 core. + * wcmDevInit -- + * Set up the device's buttons, axes and keys ****************************************************************************/ -static int wcmRegisterX11Devices (InputInfoPtr pInfo) +static int wcmDevInit(DeviceIntPtr pWcm) { + InputInfoPtr pInfo = (InputInfoPtr)pWcm->public.devicePrivate; WacomDevicePtr priv = (WacomDevicePtr)pInfo->private; WacomCommonPtr common = priv->common; unsigned char butmap[WCM_MAX_BUTTONS+1]; @@ -684,13 +685,6 @@ Bool wcmOpen(InputInfoPtr pInfo) return Success; } -static int wcmDevInit(DeviceIntPtr pWcm) -{ - InputInfoPtr pInfo = (InputInfoPtr)pWcm->public.devicePrivate; - - return wcmRegisterX11Devices (pInfo); -} - /***************************************************************************** * wcmDevOpen -- * Open the physical device and init information structs. -- 1.7.2.3 ------------------------------------------------------------------------------ Beautiful is writing same markup. Internet Explorer 9 supports standards for HTML5, CSS3, SVG 1.1, ECMAScript5, and DOM L2 & L3. Spend less time writing and rewriting code and more time creating great experiences on the web. Be a part of the beta today. http://p.sf.net/sfu/beautyoftheweb _______________________________________________ Linuxwacom-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
