diff --git a/hw/xfree86/common/xf86Xinput.c b/hw/xfree86/common/xf86Xinput.c index bbaffd0b8..538a98b3e 100644 --- a/hw/xfree86/common/xf86Xinput.c +++ b/hw/xfree86/common/xf86Xinput.c @@ -669,10 +669,7 @@ xf86AllocateInput(InputDriverPtr drv, IDevPtr idev) new->device_control = NULL; new->read_input = NULL; new->control_proc = NULL; - new->close_proc = NULL; new->switch_mode = NULL; - new->conversion_proc = NULL; - new->reverse_conversion_proc = NULL; new->dev = NULL; new->private = NULL; new->conf_idev = idev; diff --git a/hw/xfree86/common/xf86Xinput.h b/hw/xfree86/common/xf86Xinput.h index 9a3d2232d..74cc8f480 100644 --- a/hw/xfree86/common/xf86Xinput.h +++ b/hw/xfree86/common/xf86Xinput.h @@ -106,16 +106,8 @@ typedef struct _InputInfoRec { void (*read_input)(struct _InputInfoRec *local); int (*control_proc)(struct _InputInfoRec *local, xDeviceCtl *control); - void (*close_proc)(struct _InputInfoRec *local); int (*switch_mode)(ClientPtr client, DeviceIntPtr dev, int mode); - Bool (*conversion_proc)(struct _InputInfoRec *local, - int first, int num, int v0, - int v1, int v2, int v3, int v4, - int v5, int *x, int *y); - Bool (*reverse_conversion_proc)( - struct _InputInfoRec *local, - int x, int y, int *valuators); int (*set_device_valuators) (struct _InputInfoRec *local, int *valuators, int first_valuator,