[vioser]: Encapsulate pending read request completion in one function

Signed-Off-By: Martin Drab <[email protected]>

Author: Martin Drab

vioserial/sys/Port.c

@@ -1269,26 +1269,38 @@ VOID VIOSerialPortWriteIoStop(IN WDFQUEUE Queue, IN WDFREQUEST Request, IN ULONG
     TraceEvents(TRACE_LEVEL_ERROR, DBG_WRITE, "<-- %s\n", __FUNCTION__);
 }
 
-NTSTATUS VIOSerialPortEvtDeviceQueryRemove(WDFDEVICE Device)
+static VOID VIOSerialPortCompletePendingRead(PVIOSERIAL_PORT Port, NTSTATUS Status, LONG_PTR Information)
 {
     WDFREQUEST readRequest = NULL;
-    PRAWPDO_VIOSERIAL_PORT pdoData = RawPdoSerialPortGetData(Device);
-    PVIOSERIAL_PORT port = pdoData->port;
 
     TraceEvents(TRACE_LEVEL_INFORMATION, DBG_PNP, "--> %s\n", __FUNCTION__);
 
-    WdfSpinLockAcquire(port->InBufLock);
-    readRequest = port->PendingReadRequest;
-    port->PendingReadRequest = NULL;
+    WdfSpinLockAcquire(Port->InBufLock);
+    readRequest = Port->PendingReadRequest;
+    Port->PendingReadRequest = NULL;
     if (readRequest != NULL)
     {
         if (WdfRequestUnmarkCancelable(readRequest) != STATUS_CANCELLED)
         {
-            WdfRequestCompleteWithInformation(readRequest, STATUS_END_OF_FILE, 0L);
+            WdfRequestCompleteWithInformation(readRequest, Status, Information);
         }
     }
 
-    WdfSpinLockRelease(port->InBufLock);
+    WdfSpinLockRelease(Port->InBufLock);
+
+    TraceEvents(TRACE_LEVEL_INFORMATION, DBG_PNP, "<-- %s\n", __FUNCTION__);
+
+    return;
+}
+
+NTSTATUS VIOSerialPortEvtDeviceQueryRemove(WDFDEVICE Device)
+{
+    PRAWPDO_VIOSERIAL_PORT pdoData = RawPdoSerialPortGetData(Device);
+    PVIOSERIAL_PORT port = pdoData->port;
+
+    TraceEvents(TRACE_LEVEL_INFORMATION, DBG_PNP, "--> %s\n", __FUNCTION__);
+
+    VIOSerialPortCompletePendingRead(port, STATUS_END_OF_FILE, 0);
 
     TraceEvents(TRACE_LEVEL_INFORMATION, DBG_PNP, "<-- %s\n", __FUNCTION__);
 
@@ -1297,25 +1309,12 @@ NTSTATUS VIOSerialPortEvtDeviceQueryRemove(WDFDEVICE Device)
 
 VOID VIOSerialPortEvtDeviceSurpriseRemoval(WDFDEVICE Device)
 {
-    WDFREQUEST readRequest = NULL;
     PRAWPDO_VIOSERIAL_PORT pdoData = RawPdoSerialPortGetData(Device);
     PVIOSERIAL_PORT port = pdoData->port;
 
     TraceEvents(TRACE_LEVEL_INFORMATION, DBG_PNP, "--> %s\n", __FUNCTION__);
 
-    WdfSpinLockAcquire(port->InBufLock);
-    readRequest = port->PendingReadRequest;
-    port->PendingReadRequest = NULL;
-    if (readRequest != NULL)
-    {
-        if (WdfRequestUnmarkCancelable(readRequest) != STATUS_CANCELLED)
-        {
-            WdfRequestCompleteWithInformation(readRequest, STATUS_DELETE_PENDING, 0L);
-        }
-    }
-
-    port->Removed = TRUE;
-    WdfSpinLockRelease(port->InBufLock);
+    VIOSerialPortCompletePendingRead(port, STATUS_DELETE_PENDING, 0);
 
     TraceEvents(TRACE_LEVEL_INFORMATION, DBG_PNP, "<-- %s\n", __FUNCTION__);