openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Greg Kroah-Hartman 2010-05-04 08:26:23 -07:00
parent b3413092cc
commit 9e629075ac
4 changed files with 3 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/staging/hv/Makefile
View File

@ -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

27
drivers/staging/hv/ext_utils.c
View File

@ -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);
}

3
drivers/staging/hv/hyperv_utils.c
View File

@ -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)

1
drivers/staging/hv/utils.h
View File

@ -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[];