Rémi Bernon : winebus.sys: Remove the now useless device_compare callback.
Alexandre Julliard
julliard at winehq.org
Thu Sep 16 15:34:30 CDT 2021
Module: wine
Branch: master
Commit: 2a2fc11d8cef6cac96b1348e51c9e623b96c31b2
URL: https://source.winehq.org/git/wine.git/?a=commit;h=2a2fc11d8cef6cac96b1348e51c9e623b96c31b2
Author: Rémi Bernon <rbernon at codeweavers.com>
Date: Thu Sep 16 10:17:53 2021 +0200
winebus.sys: Remove the now useless device_compare callback.
Signed-off-by: Rémi Bernon <rbernon at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/winebus.sys/bus_iohid.c | 11 -----------
dlls/winebus.sys/bus_sdl.c | 6 ------
dlls/winebus.sys/bus_udev.c | 9 ---------
dlls/winebus.sys/unix_private.h | 1 -
dlls/winebus.sys/unixlib.c | 20 --------------------
dlls/winebus.sys/unixlib.h | 7 -------
6 files changed, 54 deletions(-)
diff --git a/dlls/winebus.sys/bus_iohid.c b/dlls/winebus.sys/bus_iohid.c
index 492d5a70ddb..f3b55cc0f70 100644
--- a/dlls/winebus.sys/bus_iohid.c
+++ b/dlls/winebus.sys/bus_iohid.c
@@ -161,16 +161,6 @@ static void iohid_device_destroy(struct unix_device *iface)
{
}
-static int iohid_device_compare(struct unix_device *iface, void *context)
-{
- struct platform_private *private = impl_from_unix_device(iface);
- IOHIDDeviceRef dev2 = (IOHIDDeviceRef)context;
- if (private->device != dev2)
- return 1;
- else
- return 0;
-}
-
static NTSTATUS iohid_device_start(struct unix_device *iface)
{
DWORD length;
@@ -273,7 +263,6 @@ static void iohid_device_set_feature_report(struct unix_device *iface, HID_XFER_
static const struct unix_device_vtbl iohid_device_vtbl =
{
iohid_device_destroy,
- iohid_device_compare,
iohid_device_start,
iohid_device_stop,
iohid_device_get_report_descriptor,
diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c
index d48f9507abb..bc7abcb933b 100644
--- a/dlls/winebus.sys/bus_sdl.c
+++ b/dlls/winebus.sys/bus_sdl.c
@@ -497,11 +497,6 @@ static void sdl_device_destroy(struct unix_device *iface)
{
}
-static int sdl_device_compare(struct unix_device *iface, void *context)
-{
- return impl_from_unix_device(iface)->id - PtrToUlong(context);
-}
-
static NTSTATUS sdl_device_start(struct unix_device *iface)
{
struct platform_private *ext = impl_from_unix_device(iface);
@@ -596,7 +591,6 @@ static void sdl_device_set_feature_report(struct unix_device *iface, HID_XFER_PA
static const struct unix_device_vtbl sdl_device_vtbl =
{
sdl_device_destroy,
- sdl_device_compare,
sdl_device_start,
sdl_device_stop,
sdl_device_get_reportdescriptor,
diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c
index 8cbcabf25e8..bfeb7bfc09b 100644
--- a/dlls/winebus.sys/bus_udev.c
+++ b/dlls/winebus.sys/bus_udev.c
@@ -619,13 +619,6 @@ static void hidraw_device_destroy(struct unix_device *iface)
udev_device_unref(private->udev_device);
}
-static int udev_device_compare(struct unix_device *iface, void *platform_dev)
-{
- struct udev_device *dev1 = impl_from_unix_device(iface)->udev_device;
- struct udev_device *dev2 = platform_dev;
- return strcmp(udev_device_get_syspath(dev1), udev_device_get_syspath(dev2));
-}
-
static NTSTATUS hidraw_device_start(struct unix_device *iface)
{
EnterCriticalSection(&udev_cs);
@@ -796,7 +789,6 @@ static void hidraw_device_set_feature_report(struct unix_device *iface, HID_XFER
static const struct unix_device_vtbl hidraw_device_vtbl =
{
hidraw_device_destroy,
- udev_device_compare,
hidraw_device_start,
hidraw_device_stop,
hidraw_device_get_report_descriptor,
@@ -898,7 +890,6 @@ static void lnxev_device_set_feature_report(struct unix_device *iface, HID_XFER_
static const struct unix_device_vtbl lnxev_device_vtbl =
{
lnxev_device_destroy,
- udev_device_compare,
lnxev_device_start,
lnxev_device_stop,
lnxev_device_get_report_descriptor,
diff --git a/dlls/winebus.sys/unix_private.h b/dlls/winebus.sys/unix_private.h
index 9b2c6d81fa2..f2af846473a 100644
--- a/dlls/winebus.sys/unix_private.h
+++ b/dlls/winebus.sys/unix_private.h
@@ -32,7 +32,6 @@
struct unix_device_vtbl
{
void (*destroy)(struct unix_device *iface);
- int (*compare)(struct unix_device *iface, void *platform_dev);
NTSTATUS (*start)(struct unix_device *iface);
void (*stop)(struct unix_device *iface);
NTSTATUS (*get_report_descriptor)(struct unix_device *iface, BYTE *buffer, DWORD length, DWORD *out_length);
diff --git a/dlls/winebus.sys/unixlib.c b/dlls/winebus.sys/unixlib.c
index 008fb6e77a2..b6fcdf18ffe 100644
--- a/dlls/winebus.sys/unixlib.c
+++ b/dlls/winebus.sys/unixlib.c
@@ -51,11 +51,6 @@ static void mouse_destroy(struct unix_device *iface)
hid_descriptor_free(&impl->desc);
}
-static int mouse_compare(struct unix_device *iface, void *context)
-{
- return 0;
-}
-
static NTSTATUS mouse_start(struct unix_device *iface)
{
struct mouse_device *impl = mouse_from_unix_device(iface);
@@ -111,7 +106,6 @@ static void mouse_set_feature_report(struct unix_device *iface, HID_XFER_PACKET
static const struct unix_device_vtbl mouse_vtbl =
{
mouse_destroy,
- mouse_compare,
mouse_start,
mouse_stop,
mouse_get_report_descriptor,
@@ -155,11 +149,6 @@ static void keyboard_destroy(struct unix_device *iface)
hid_descriptor_free(&impl->desc);
}
-static int keyboard_compare(struct unix_device *iface, void *context)
-{
- return 0;
-}
-
static NTSTATUS keyboard_start(struct unix_device *iface)
{
struct keyboard_device *impl = keyboard_from_unix_device(iface);
@@ -215,7 +204,6 @@ static void keyboard_set_feature_report(struct unix_device *iface, HID_XFER_PACK
static const struct unix_device_vtbl keyboard_vtbl =
{
keyboard_destroy,
- keyboard_compare,
keyboard_start,
keyboard_stop,
keyboard_get_report_descriptor,
@@ -275,13 +263,6 @@ static NTSTATUS unix_device_remove(void *args)
return STATUS_SUCCESS;
}
-static NTSTATUS unix_device_compare(void *args)
-{
- struct device_compare_params *params = args;
- struct unix_device *iface = params->iface;
- return iface->vtbl->compare(iface, params->context);
-}
-
static NTSTATUS unix_device_start(void *args)
{
struct unix_device *iface = args;
@@ -333,7 +314,6 @@ const unixlib_entry_t __wine_unix_call_funcs[] =
mouse_device_create,
keyboard_device_create,
unix_device_remove,
- unix_device_compare,
unix_device_start,
unix_device_get_report_descriptor,
unix_device_set_output_report,
diff --git a/dlls/winebus.sys/unixlib.h b/dlls/winebus.sys/unixlib.h
index cd5f64cbb51..ccca8d12e8b 100644
--- a/dlls/winebus.sys/unixlib.h
+++ b/dlls/winebus.sys/unixlib.h
@@ -98,12 +98,6 @@ struct device_create_params
struct unix_device *device;
};
-struct device_compare_params
-{
- struct unix_device *iface;
- void *context;
-};
-
struct device_descriptor_params
{
struct unix_device *iface;
@@ -133,7 +127,6 @@ enum unix_funcs
mouse_create,
keyboard_create,
device_remove,
- device_compare,
device_start,
device_get_report_descriptor,
device_set_output_report,
More information about the wine-cvs
mailing list