diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-05-04 08:26:23 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-05-11 11:36:04 -0700 |
| commit | 9e629075ac694ab4d4971d4e62dfb749118bce70 (patch) | |
| tree | df8e16030c11c9f8365d545429436a570b9a5bed /drivers/staging/hv | |
| parent | b3413092cc86d6c1b5b1408c3bb37998a82a588a (diff) | |
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>
Diffstat (limited to 'drivers/staging/hv')
| -rw-r--r-- | drivers/staging/hv/Makefile | 2 | ||||
| -rw-r--r-- | drivers/staging/hv/ext_utils.c | 27 | ||||
| -rw-r--r-- | drivers/staging/hv/hyperv_utils.c | 3 | ||||
| -rw-r--r-- | drivers/staging/hv/utils.h | 1 |
4 files changed, 3 insertions, 30 deletions
diff --git a/drivers/staging/hv/Makefile b/drivers/staging/hv/Makefile index d2977ab9db4..7a57a886ab1 100644 --- 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 deleted file mode 100644 index a44cd1b93e0..00000000000 --- a/drivers/staging/hv/ext_utils.c +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright (c) 2010, Microsoft Corporation. - * - * This program is free software; you can redistribute it and/or modify it - * under the terms and conditions of the GNU General Public License, - * version 2, as published by the Free Software Foundation. - * - * This program is distributed in the hope it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - * more details. - * - * You should have received a copy of the GNU General Public License along with - * this program; if not, write to the Free Software Foundation, Inc., 59 Temple - * Place - Suite 330, Boston, MA 02111-1307 USA. - * - * Authors: - * Haiyang Zhang <haiyangz@microsoft.com> - * Hank Janssen <hjanssen@microsoft.com> - */ -#include <linux/reboot.h> -#include "utils.h" - -void shutdown_linux_system() -{ - orderly_poweroff(false); -} diff --git a/drivers/staging/hv/hyperv_utils.c b/drivers/staging/hv/hyperv_utils.c index 2a4864784ed..ca52fbada7d 100644 --- 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 index 0f2507dcc89..e404b21e9af 100644 --- 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[]; |