[win-pv-devel] [PATCH 06/15] Remove unnecessary helper function

[Paul Durrant <pdurrant@xxxxxxxxx>]

The __EvtchnAcquire/ReleaseInterruptLock functions are only used in one
place. Remove them and call the underlying Fdo functions directly.

Signed-off-by: Paul Durrant <paul.durrant@xxxxxxxxxx>
---
 src/xenbus/evtchn.c | 29 ++---------------------------
 1 file changed, 2 insertions(+), 27 deletions(-)

diff --git a/src/xenbus/evtchn.c b/src/xenbus/evtchn.c
index b3f147c..f5f7c67 100644
--- a/src/xenbus/evtchn.c
+++ b/src/xenbus/evtchn.c
@@ -198,31 +198,6 @@ EvtchnInterruptDisable(
     Trace("<====\n");
 }
 
-static FORCEINLINE
-_IRQL_requires_max_(HIGH_LEVEL)
-_IRQL_saves_
-_IRQL_raises_(HIGH_LEVEL)
-KIRQL
-__EvtchnAcquireInterruptLock(
-    IN  PXENBUS_EVTCHN_CONTEXT  Context,
-    IN  PXENBUS_EVTCHN_CHANNEL  Channel
-    )
-{
-    return FdoAcquireInterruptLock(Context->Fdo, Channel->Interrupt);
-}
-
-static FORCEINLINE
-__drv_requiresIRQL(HIGH_LEVEL)
-VOID
-__EvtchnReleaseInterruptLock(
-    IN  PXENBUS_EVTCHN_CONTEXT      Context,
-    IN  PXENBUS_EVTCHN_CHANNEL      Channel,
-    IN  __drv_restoresIRQL KIRQL    Irql
-    )
-{
-    FdoReleaseInterruptLock(Context->Fdo, Channel->Interrupt, Irql);
-}
-
 static NTSTATUS
 EvtchnOpenFixed(
     IN  PXENBUS_EVTCHN_CHANNEL  Channel,
@@ -596,12 +571,12 @@ EvtchnCallback(
     UNREFERENCED_PARAMETER(Dpc);
     UNREFERENCED_PARAMETER(Argument2);
 
-    Irql = __EvtchnAcquireInterruptLock(Context, Channel);
+    Irql = FdoAcquireInterruptLock(Context->Fdo, Channel->Interrupt);
 
 #pragma warning(suppress:6387)  // NULL argument
     (VOID) Channel->Callback(NULL, Channel->Argument);
 
-    __EvtchnReleaseInterruptLock(Context, Channel, Irql);
+    FdoReleaseInterruptLock(Context->Fdo, Channel->Interrupt, Irql);
 }
 
 static VOID
-- 
2.1.1


_______________________________________________
win-pv-devel mailing list
win-pv-devel@xxxxxxxxxxxxxxxxxxxx
http://lists.xenproject.org/cgi-bin/mailman/listinfo/win-pv-devel