Remove RingTrigger

RingTrigger calls XENBUS_EVTCHN(Trigger..) on during the suspend
callback. Just before this, the ring is recreated and enabled, which
also calls XENBUS_EVTCHN(Trigger..). The explicit call RingTrigger is
unneccessary

Signed-off-by: Owen Smith <owen.smith@citrix.com>

diff --git a/src/xenvbd/frontend.c b/src/xenvbd/frontend.c
index 1cb7f0a016ea2dab6c20193ca61b30652bd357a7..5dcf14d806ec38d402731a761784ead0ef8a7e88 100644 (file)
--- a/src/xenvbd/frontend.c
+++ b/src/xenvbd/frontend.c
@@ -1593,8 +1593,6 @@ FrontendSuspendCallback(
         ASSERT(FALSE);
     }
 
-    RingTrigger(Frontend->Ring);
-
     Verbose("Target[%d] : <=== restored %s\n", Frontend->TargetId, __XenvbdStateName(Frontend->State));
 }
 

diff --git a/src/xenvbd/ring.c b/src/xenvbd/ring.c
index 33b346d4acac46f5ecb7bffaade166473adaa3f9..e41c1b79c1f12c2625c0fd35636920f779b567d7 100644 (file)
--- a/src/xenvbd/ring.c
+++ b/src/xenvbd/ring.c
@@ -2037,19 +2037,6 @@ RingDisconnect(
     Ring->Received = 0;
 }
 
-VOID
-RingTrigger(
-    IN  PXENVBD_RING    Ring
-    )
-{
-    if (!Ring->Enabled)
-        return;
-
-    XENBUS_EVTCHN(Trigger,
-                  &Ring->EvtchnInterface,
-                  Ring->Channel);
-}
-
 BOOLEAN
 RingQueueRequest(
     IN  PXENVBD_RING    Ring,

diff --git a/src/xenvbd/ring.h b/src/xenvbd/ring.h
index 9b8a587e5c1b60af053f0fbc9f2a06185230cbf6..e3309e25a2b8b80cb7ea2f5a4c5331293a5ce625 100644 (file)
--- a/src/xenvbd/ring.h
+++ b/src/xenvbd/ring.h
@@ -74,11 +74,6 @@ RingDisconnect(
     IN  PXENVBD_RING    Ring
     );
 
-extern VOID
-RingTrigger(
-    IN  PXENVBD_RING    Ring
-    );
-
 extern BOOLEAN
 RingQueueRequest(
     IN  PXENVBD_RING    Ring,