OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Staging: hv: Move the contents of vmbus.h to hyperv.h 

Move the contents of vmbus.h to hyperv.h.

Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Abhishek Kane <v-abkane@microsoft.com>
Signed-off-by: Hank Janssen <hjanssen@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
K. Y. Srinivasan 2011-05-12 19:34:25 -07:00 committed by Greg Kroah-Hartman
parent 35ea09c390
commit 27b5b3ca69
11 changed files with 20 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/staging/hv/blkvsc_drv.c
View File

@ -34,7 +34,6 @@
#include "hyperv.h"
#include "hv_api.h"
#include "vmbus.h"
#include "storvsc_api.h"

1
drivers/staging/hv/hv_kvp.c
View File

@ -29,7 +29,6 @@
#include "hyperv.h"
#include "hv_api.h"
#include "vmbus.h"
#include "vmbus_private.h"
#include "utils.h"
#include "hv_kvp.h"

1
drivers/staging/hv/hv_mouse.c
View File

@ -28,7 +28,6 @@
#include "hyperv.h"
#include "hv_api.h"
#include "vmbus.h"
/*

1
drivers/staging/hv/hv_util.c
View File

@ -31,7 +31,6 @@
#include "hyperv.h"
#include "hv_api.h"
#include "vmbus.h"
#include "vmbus_private.h"
#include "utils.h"
#include "hv_kvp.h"

20
drivers/staging/hv/hyperv.h
View File

@ -822,4 +822,24 @@ struct hv_device {
void *ext;
};
#include <linux/device.h>
static inline struct hv_device *device_to_hv_device(struct device *d)
{
return container_of(d, struct hv_device, device);
}
static inline struct hv_driver *drv_to_hv_drv(struct device_driver *d)
{
return container_of(d, struct hv_driver, driver);
}
/* Vmbus interface */
int vmbus_child_driver_register(struct device_driver *drv);
void vmbus_child_driver_unregister(struct device_driver *drv);
extern struct completion hv_channel_ready;
#endif /* _HYPERV_H */

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

@ -26,7 +26,6 @@
#define _NETVSC_API_H_
#include "hyperv.h"
#include "vmbus.h"
/* Fwd declaration */
struct hv_netvsc_packet;

1
drivers/staging/hv/netvsc_drv.c
View File

@ -41,7 +41,6 @@
#include "hyperv.h"
#include "hv_api.h"
#include "vmbus.h"
#include "netvsc_api.h"
struct net_device_context {

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

@ -29,7 +29,6 @@
#include <linux/wait.h>
#include "vstorage.h"
#include "hyperv.h"
#include "vmbus.h"
/* Defines */
#define STORVSC_RING_BUFFER_SIZE (20*PAGE_SIZE)

1
drivers/staging/hv/storvsc_drv.c
View File

@ -35,7 +35,6 @@
#include "hyperv.h"
#include "hv_api.h"
#include "vmbus.h"
#include "storvsc_api.h"
#include "vstorage.h"

51
drivers/staging/hv/vmbus.h
View File

@ -1,51 +0,0 @@
/*
*
* Copyright (c) 2009, 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>
*
*/
#ifndef _VMBUS_H_
#define _VMBUS_H_
#include <linux/device.h>
#include "hyperv.h"
static inline struct hv_device *device_to_hv_device(struct device *d)
{
return container_of(d, struct hv_device, device);
}
static inline struct hv_driver *drv_to_hv_drv(struct device_driver *d)
{
return container_of(d, struct hv_driver, driver);
}
/* Vmbus interface */
int vmbus_child_driver_register(struct device_driver *drv);
void vmbus_child_driver_unregister(struct device_driver *drv);
extern struct completion hv_channel_ready;
#endif /* _VMBUS_H_ */

1
drivers/staging/hv/vmbus_drv.c
View File

@ -37,7 +37,6 @@
#include "hyperv.h"
#include "hv_api.h"
#include "vmbus.h"
#include "vmbus_private.h"