Commit 27b5b3ca authored by K. Y. Srinivasan's avatar K. Y. Srinivasan Committed by Greg Kroah-Hartman
Browse files

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



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

Signed-off-by: default avatarK. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: default avatarHaiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: default avatarAbhishek Kane <v-abkane@microsoft.com>
Signed-off-by: default avatarHank Janssen <hjanssen@microsoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 35ea09c3

drivers/staging/hv/blkvsc_drv.c

+0 −1
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ 


#include "hyperv.h"

#include "hv_api.h"

#include "vmbus.h"

#include "storvsc_api.h"

drivers/staging/hv/hv_kvp.c

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

drivers/staging/hv/hv_mouse.c

+0 −1
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ 


#include "hyperv.h"

#include "hv_api.h"

#include "vmbus.h"





/*

drivers/staging/hv/hv_util.c

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

drivers/staging/hv/hyperv.h

+20 −0
Original line number Diff line number Diff line
@@ -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 */