Staging: hv: delete ext_utils.c

A whole file just for a single line function call is beyond silly. Delete it and move the call into where it is being called. Cc: Hank Janssen <hjanssen@microsoft.com> Cc: Haiyang Zhang <haiyangz@microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
git-mirror · May 11, 2010 · 9e62907 · 9e62907
1 parent b341309
commit 9e62907
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 30 deletions.
diff --git a/drivers/staging/hv/Makefile b/drivers/staging/hv/Makefile
@@ -10,4 +10,4 @@ hv_vmbus-objs := vmbus_drv.o osd.o \
 hv_storvsc-objs := storvsc_drv.o StorVsc.o
 hv_blkvsc-objs := blkvsc_drv.o BlkVsc.o
 hv_netvsc-objs := netvsc_drv.o NetVsc.o RndisFilter.o
-hv_utils-objs := hyperv_utils.o ext_utils.o
+hv_utils-objs := hyperv_utils.o
diff --git a/drivers/staging/hv/ext_utils.c b/drivers/staging/hv/ext_utils.c
diff --git a/drivers/staging/hv/hyperv_utils.c b/drivers/staging/hv/hyperv_utils.c
@@ -23,6 +23,7 @@
 #include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/sysctl.h>
+#include <linux/reboot.h>
 #include <linux/version.h>
 
 #include "logging.h"
@@ -103,7 +104,7 @@ void shutdown_onchannelcallback(void *context)
 	DPRINT_EXIT(VMBUS);
 
 	if (execute_shutdown == true)
-		shutdown_linux_system();
+		orderly_poweroff(false);
 }
 
 static int __init init_hyperv_utils(void)

diff --git a/drivers/staging/hv/utils.h b/drivers/staging/hv/utils.h
@@ -87,7 +87,6 @@ struct hyperv_service_callback {
 
 extern void prep_negotiate_resp(struct icmsg_hdr *,
 				struct icmsg_negotiate *, u8 *);
-extern void shutdown_linux_system(void);
 extern void chn_cb_negotiate(void *);
 extern struct hyperv_service_callback hv_cb_utils[];