From: Greg Kroah-Hartman Date: Wed, 19 Aug 2009 23:21:28 +0000 (-0700) Subject: Staging: hv: move vmbus.h X-Git-Tag: firefly_0821_release~12948^2~361 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=870cde8086a40b96ce6e39552e57482d577ddd9d;p=firefly-linux-kernel-4.4.55.git Staging: hv: move vmbus.h This moves vmbus.h from the include/ subdirectory. It doesn't belong there. No code changes happened here. Cc: Hank Janssen Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/hv/blkvsc_drv.c b/drivers/staging/hv/blkvsc_drv.c index c64ac893076f..f91fa431b7c5 100644 --- a/drivers/staging/hv/blkvsc_drv.c +++ b/drivers/staging/hv/blkvsc_drv.c @@ -35,7 +35,7 @@ #include "osd.h" #include "include/logging.h" -#include "include/vmbus.h" +#include "vmbus.h" #include "include/StorVscApi.h" diff --git a/drivers/staging/hv/include/vmbus.h b/drivers/staging/hv/include/vmbus.h deleted file mode 100644 index 2ea6ce0703ca..000000000000 --- a/drivers/staging/hv/include/vmbus.h +++ /dev/null @@ -1,99 +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 - * Hank Janssen - * - */ - - -#ifndef _VMBUS_H_ -#define _VMBUS_H_ - -#include - -#include "VmbusApi.h" - - -/* Data types */ - - -typedef int (*PFN_DRIVERINITIALIZE)(struct hv_driver *drv); -typedef int (*PFN_DRIVEREXIT)(struct hv_driver *drv); - -struct driver_context { - struct hv_guid class_id; - - struct device_driver driver; - - /* Use these methods instead of the struct device_driver so 2.6 kernel stops complaining */ - int (*probe)(struct device *); - int (*remove)(struct device *); - void (*shutdown)(struct device *); -}; - -struct device_context { - struct work_struct probe_failed_work_item; - struct hv_guid class_id; - struct hv_guid device_id; - int probe_error; - struct device device; - struct hv_device device_obj; -}; - - - -/* Global */ - - - -/* Inlines */ - -static inline struct device_context *to_device_context(struct hv_device *device_obj) -{ - return container_of(device_obj, struct device_context, device_obj); -} - -static inline struct device_context *device_to_device_context(struct device *device) -{ - return container_of(device, struct device_context, device); -} - -static inline struct driver_context *driver_to_driver_context(struct device_driver *driver) -{ - return container_of(driver, struct driver_context, driver); -} - - -/* Vmbus interface */ - -int vmbus_child_driver_register( - struct driver_context* driver_ctx - ); - -void -vmbus_child_driver_unregister( - struct driver_context *driver_ctx - ); - -void -vmbus_get_interface( - VMBUS_CHANNEL_INTERFACE *interface - ); - -#endif /* _VMBUS_H_ */ diff --git a/drivers/staging/hv/netvsc_drv.c b/drivers/staging/hv/netvsc_drv.c index e847cb6c266c..9ea61b281ef4 100644 --- a/drivers/staging/hv/netvsc_drv.c +++ b/drivers/staging/hv/netvsc_drv.c @@ -38,7 +38,7 @@ #include "osd.h" #include "include/logging.h" -#include "include/vmbus.h" +#include "vmbus.h" #include "include/NetVscApi.h" diff --git a/drivers/staging/hv/storvsc_drv.c b/drivers/staging/hv/storvsc_drv.c index 4574f2b848bb..a3d591dac046 100644 --- a/drivers/staging/hv/storvsc_drv.c +++ b/drivers/staging/hv/storvsc_drv.c @@ -38,7 +38,7 @@ #include "osd.h" #include "include/logging.h" -#include "include/vmbus.h" +#include "vmbus.h" #include "include/StorVscApi.h" diff --git a/drivers/staging/hv/vmbus.h b/drivers/staging/hv/vmbus.h new file mode 100644 index 000000000000..44a784c02327 --- /dev/null +++ b/drivers/staging/hv/vmbus.h @@ -0,0 +1,99 @@ +/* + * + * 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 + * Hank Janssen + * + */ + + +#ifndef _VMBUS_H_ +#define _VMBUS_H_ + +#include + +#include "include/VmbusApi.h" + + +/* Data types */ + + +typedef int (*PFN_DRIVERINITIALIZE)(struct hv_driver *drv); +typedef int (*PFN_DRIVEREXIT)(struct hv_driver *drv); + +struct driver_context { + struct hv_guid class_id; + + struct device_driver driver; + + /* Use these methods instead of the struct device_driver so 2.6 kernel stops complaining */ + int (*probe)(struct device *); + int (*remove)(struct device *); + void (*shutdown)(struct device *); +}; + +struct device_context { + struct work_struct probe_failed_work_item; + struct hv_guid class_id; + struct hv_guid device_id; + int probe_error; + struct device device; + struct hv_device device_obj; +}; + + + +/* Global */ + + + +/* Inlines */ + +static inline struct device_context *to_device_context(struct hv_device *device_obj) +{ + return container_of(device_obj, struct device_context, device_obj); +} + +static inline struct device_context *device_to_device_context(struct device *device) +{ + return container_of(device, struct device_context, device); +} + +static inline struct driver_context *driver_to_driver_context(struct device_driver *driver) +{ + return container_of(driver, struct driver_context, driver); +} + + +/* Vmbus interface */ + +int vmbus_child_driver_register( + struct driver_context* driver_ctx + ); + +void +vmbus_child_driver_unregister( + struct driver_context *driver_ctx + ); + +void +vmbus_get_interface( + VMBUS_CHANNEL_INTERFACE *interface + ); + +#endif /* _VMBUS_H_ */ diff --git a/drivers/staging/hv/vmbus_drv.c b/drivers/staging/hv/vmbus_drv.c index 5268b51347e6..1700dd3be811 100644 --- a/drivers/staging/hv/vmbus_drv.c +++ b/drivers/staging/hv/vmbus_drv.c @@ -30,7 +30,7 @@ #include #include "osd.h" #include "include/logging.h" -#include "include/vmbus.h" +#include "vmbus.h" /* Defines */