Commit 9e629075 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

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: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent b3413092

drivers/staging/hv/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -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

drivers/staging/hv/ext_utils.c

deleted100644 → 0
+0 −27
Original line number Diff line number Diff line 
/*

 * 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);

}

drivers/staging/hv/hyperv_utils.c

+2 −1
Original line number Diff line number Diff line
@@ -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)

drivers/staging/hv/utils.h

+0 −1
Original line number Diff line number Diff line
@@ -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[];