hidclass.sys: Get rid of unused minidriver parameter to HID_DeleteDevice().

Signed-off-by: Zebediah Figura <z.figura12@gmail.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

hidclass.sys: Get rid of unused minidriver parameter to HID_DeleteDevice().
3d011fcd · Zebediah Figura · Alexandre Julliard · 700633ee · 3d011fcd · 3d011fcd
Commit 3d011fcd authored Jun 06, 2019 by Zebediah Figura Committed by Alexandre Julliard Jun 06, 2019
Show whitespace changes
Inline Side-by-side

Showing with 9 additions and 10 deletions

device.c dlls/hidclass.sys/device.c +1 -2

hid.h dlls/hidclass.sys/hid.h +1 -1

pnp.c dlls/hidclass.sys/pnp.c +7 -7

No files found.
--- a/dlls/hidclass.sys/device.c
+++ b/dlls/hidclass.sys/device.c
@@ -174,8 +174,7 @@ static void WINAPI read_cancel_routine(DEVICE_OBJECT *device, IRP *irp)
    IoCompleteRequest(irp, IO_NO_INCREMENT);
 }

-
-void HID_DeleteDevice(HID_MINIDRIVER_REGISTRATION *driver, DEVICE_OBJECT *device)
+void HID_DeleteDevice(DEVICE_OBJECT *device)
 {
    BASE_DEVICE_EXTENSION *ext;
    IRP *irp;

--- a/dlls/hidclass.sys/hid.h
+++ b/dlls/hidclass.sys/hid.h
@@ -94,7 +94,7 @@ minidriver* find_minidriver(DRIVER_OBJECT* driver) DECLSPEC_HIDDEN;
 /* Internal device functions */
 NTSTATUS HID_CreateDevice(DEVICE_OBJECT *native_device, HID_MINIDRIVER_REGISTRATION *driver, DEVICE_OBJECT **device) DECLSPEC_HIDDEN;
 NTSTATUS HID_LinkDevice(DEVICE_OBJECT *device) DECLSPEC_HIDDEN;
-void HID_DeleteDevice(HID_MINIDRIVER_REGISTRATION *driver, DEVICE_OBJECT *device) DECLSPEC_HIDDEN;
+void HID_DeleteDevice(DEVICE_OBJECT *device) DECLSPEC_HIDDEN;
 void HID_StartDeviceThread(DEVICE_OBJECT *device) DECLSPEC_HIDDEN;

 NTSTATUS WINAPI HID_Device_ioctl(DEVICE_OBJECT *device, IRP *irp) DECLSPEC_HIDDEN;

--- a/dlls/hidclass.sys/pnp.c
+++ b/dlls/hidclass.sys/pnp.c
@@ -122,7 +122,7 @@ NTSTATUS WINAPI PNP_AddDevice(DRIVER_OBJECT *driver, DEVICE_OBJECT *PDO)
    if (status != STATUS_SUCCESS)
    {
        ERR("Minidriver AddDevice failed (%x)\n",status);
-        HID_DeleteDevice(&minidriver->minidriver, device);
+        HID_DeleteDevice(device);
        return status;
    }

@@ -132,7 +132,7 @@ NTSTATUS WINAPI PNP_AddDevice(DRIVER_OBJECT *driver, DEVICE_OBJECT *PDO)
    if (status != STATUS_SUCCESS)
    {
        ERR("Minidriver failed to get Attributes(%x)\n",status);
-        HID_DeleteDevice(&minidriver->minidriver, device);
+        HID_DeleteDevice(device);
        return status;
    }

@@ -146,7 +146,7 @@ NTSTATUS WINAPI PNP_AddDevice(DRIVER_OBJECT *driver, DEVICE_OBJECT *PDO)
    if (status != STATUS_SUCCESS)
    {
        ERR("Cannot get Device Descriptor(%x)\n",status);
-        HID_DeleteDevice(&minidriver->minidriver, device);
+        HID_DeleteDevice(device);
        return status;
    }
    for (i = 0; i < descriptor.bNumDescriptors; i++)
@@ -156,7 +156,7 @@ NTSTATUS WINAPI PNP_AddDevice(DRIVER_OBJECT *driver, DEVICE_OBJECT *PDO)
    if (i >= descriptor.bNumDescriptors)
    {
        ERR("No Report Descriptor found in reply\n");
-        HID_DeleteDevice(&minidriver->minidriver, device);
+        HID_DeleteDevice(device);
        return status;
    }

@@ -166,7 +166,7 @@ NTSTATUS WINAPI PNP_AddDevice(DRIVER_OBJECT *driver, DEVICE_OBJECT *PDO)
    if (status != STATUS_SUCCESS)
    {
        ERR("Cannot get Report Descriptor(%x)\n",status);
-        HID_DeleteDevice(&minidriver->minidriver, device);
+        HID_DeleteDevice(device);
        HeapFree(GetProcessHeap(), 0, reportDescriptor);
        return status;
    }
@@ -177,7 +177,7 @@ NTSTATUS WINAPI PNP_AddDevice(DRIVER_OBJECT *driver, DEVICE_OBJECT *PDO)
    if (!ext->preparseData)
    {
        ERR("Cannot parse Report Descriptor\n");
-        HID_DeleteDevice(&minidriver->minidriver, device);
+        HID_DeleteDevice(device);
        return STATUS_NOT_SUPPORTED;
    }

@@ -217,7 +217,7 @@ NTSTATUS PNP_RemoveDevice(minidriver *minidriver, DEVICE_OBJECT *device, IRP *ir

    if (irp)
        rc = minidriver->PNPDispatch(device, irp);
-    HID_DeleteDevice(&minidriver->minidriver, device);
+    HID_DeleteDevice(device);
    LIST_FOR_EACH_ENTRY(hiddev,  &minidriver->device_list, hid_device, entry)
    {
        if (hiddev->device == device)