[bus] Rename bus__finalize to bus__module_shutdown

diff --git a/src/include/bus.h b/src/include/bus.h
index 8bf3510..acdad4f 100644 (file)
--- a/src/include/bus.h
+++ b/src/include/bus.h
@@ -48,11 +48,7 @@ extern NTSTATUS STDCALL bus__get_dev_capabilities(
   );
 
 extern NTSTATUS bus__module_init(void);
-
-/**
- * Tear down the global, bus-common environment.
- */
-extern void bus__finalize(void);
+extern void bus__module_shutdown(void);
 
 /**
  * Create a new bus.

diff --git a/src/winvblock/bus/bus.c b/src/winvblock/bus/bus.c
index 9cd3f19..503b309 100644 (file)
--- a/src/winvblock/bus/bus.c
+++ b/src/winvblock/bus/bus.c
@@ -50,7 +50,7 @@ static device__create_pdo_decl(bus__create_pdo_);
 /**
  * Tear down the global, bus-common environment.
  */
-void bus__finalize(void) {
+void bus__module_shutdown(void) {
     UNICODE_STRING DosDeviceName;
   
     DBG("Entry\n");

diff --git a/src/winvblock/driver.c b/src/winvblock/driver.c
index a87c92a..00430d8 100644 (file)
--- a/src/winvblock/driver.c
+++ b/src/winvblock/driver.c
@@ -322,18 +322,14 @@ winvblock__lib_func NTSTATUS STDCALL (driver__default_dispatch)(
     return status;
   }
 
-static void STDCALL
-Driver_Unload (
-  IN PDRIVER_OBJECT DriverObject
- )
-{
-  if ( Driver_Globals_StateHandle != NULL )
-    PoUnregisterSystemState ( Driver_Globals_StateHandle );
-  bus__finalize (  );
-  wv_free(os_load_opts);
-  Driver_Globals_Started = FALSE;
-  DBG ( "Done\n" );
-}
+static void STDCALL Driver_Unload(IN PDRIVER_OBJECT DriverObject) {
+    if (Driver_Globals_StateHandle != NULL)
+      PoUnregisterSystemState(Driver_Globals_StateHandle);
+    bus__module_shutdown();
+    wv_free(os_load_opts);
+    Driver_Globals_Started = FALSE;
+    DBG("Done\n");
+  }
 
 winvblock__lib_func void STDCALL
 Driver_CompletePendingIrp (