[PATCH 04/13] staging/hv: use struct vmbus_driver_object
Joe Perches
joe at perches.com
Thu Jul 30 00:40:57 UTC 2009
Signed-off-by: Joe Perches <joe at perches.com>
---
drivers/staging/hv/Vmbus.c | 19 ++++++++++++-------
drivers/staging/hv/include/VmbusApi.h | 4 ++--
drivers/staging/hv/vmbus_drv.c | 20 +++++++++++---------
3 files changed, 25 insertions(+), 18 deletions(-)
diff --git a/drivers/staging/hv/Vmbus.c b/drivers/staging/hv/Vmbus.c
index db0d87b..ef8e136 100644
--- a/drivers/staging/hv/Vmbus.c
+++ b/drivers/staging/hv/Vmbus.c
@@ -84,7 +84,7 @@ Description:
--*/
int VmbusInitialize(struct driver_object *drv)
{
- VMBUS_DRIVER_OBJECT *driver = (VMBUS_DRIVER_OBJECT *) drv;
+ struct vmbus_driver_object *driver = (struct vmbus_driver_object *)drv;
int ret = 0;
DPRINT_ENTER(VMBUS);
@@ -190,7 +190,8 @@ Description:
struct hv_device *VmbusChildDeviceCreate(GUID DeviceType,
GUID DeviceInstance, void *Context)
{
- VMBUS_DRIVER_OBJECT *vmbusDriver = (VMBUS_DRIVER_OBJECT *) gDriver;
+ struct vmbus_driver_object *vmbusDriver =
+ (struct vmbus_driver_object *)gDriver;
return vmbusDriver->OnChildDeviceCreate(DeviceType,
DeviceInstance, Context);
@@ -207,7 +208,8 @@ Description:
--*/
int VmbusChildDeviceAdd(struct hv_device *ChildDevice)
{
- VMBUS_DRIVER_OBJECT *vmbusDriver = (VMBUS_DRIVER_OBJECT *) gDriver;
+ struct vmbus_driver_object *vmbusDriver =
+ (struct vmbus_driver_object *)gDriver;
return vmbusDriver->OnChildDeviceAdd(gDevice, ChildDevice);
}
@@ -223,7 +225,8 @@ Description:
--*/
void VmbusChildDeviceRemove(struct hv_device *ChildDevice)
{
- VMBUS_DRIVER_OBJECT *vmbusDriver = (VMBUS_DRIVER_OBJECT *) gDriver;
+ struct vmbus_driver_object *vmbusDriver =
+ (struct vmbus_driver_object *) gDriver;
vmbusDriver->OnChildDeviceRemove(ChildDevice);
}
@@ -244,7 +247,7 @@ VmbusChildDeviceDestroy(
struct hv_device *ChildDevice
)
{
-VMBUS_DRIVER_OBJECT* vmbusDriver = (VMBUS_DRIVER_OBJECT*)gDriver;
+struct vmbus_driver_object* vmbusDriver = (struct vmbus_driver_object*)gDriver;
vmbusDriver->OnChildDeviceDestroy(ChildDevice);
}
@@ -321,7 +324,8 @@ Description:
--*/
void VmbusOnCleanup(struct driver_object *drv)
{
- /* VMBUS_DRIVER_OBJECT* driver = (VMBUS_DRIVER_OBJECT*)drv; */
+ /* struct vmbus_driver_object* driver =
+ (struct vmbus_driver_object*)drv; */
DPRINT_ENTER(VMBUS);
@@ -408,7 +412,8 @@ Description:
--*/
int VmbusOnISR(struct driver_object *drv)
{
- /* VMBUS_DRIVER_OBJECT* driver = (VMBUS_DRIVER_OBJECT*)drv; */
+ /* struct vmbus_driver_object* driver =
+ (struct vmbus_driver_object*)drv; */
int ret = 0;
/* struct page* page; */
diff --git a/drivers/staging/hv/include/VmbusApi.h b/drivers/staging/hv/include/VmbusApi.h
index ce222fd..72dacc2 100644
--- a/drivers/staging/hv/include/VmbusApi.h
+++ b/drivers/staging/hv/include/VmbusApi.h
@@ -205,7 +205,7 @@ struct hv_device {
};
/* Vmbus driver object */
-typedef struct _VMBUS_DRIVER_OBJECT {
+struct vmbus_driver_object {
struct driver_object Base; /* !! Must be the 1st field !! */
/* Set by the caller */
@@ -224,7 +224,7 @@ typedef struct _VMBUS_DRIVER_OBJECT {
VMBUS_GET_CHANNEL_INTERFACE GetChannelInterface;
VMBUS_GET_CHANNEL_INFO GetChannelInfo;
-} VMBUS_DRIVER_OBJECT;
+};
/* Interface */
diff --git a/drivers/staging/hv/vmbus_drv.c b/drivers/staging/hv/vmbus_drv.c
index d3a03ce..eeb91cb 100644
--- a/drivers/staging/hv/vmbus_drv.c
+++ b/drivers/staging/hv/vmbus_drv.c
@@ -45,7 +45,7 @@ struct vmbus_driver_context {
/* The driver field is not used in here. Instead, the bus field is */
/* used to represent the driver */
struct driver_context drv_ctx;
- VMBUS_DRIVER_OBJECT drv_obj;
+ struct vmbus_driver_object drv_obj;
struct bus_type bus;
struct tasklet_struct msg_dpc;
@@ -303,7 +303,7 @@ int vmbus_bus_init(PFN_DRIVERINITIALIZE pfn_drv_init)
unsigned int vector = 0;
struct vmbus_driver_context *vmbus_drv_ctx = &g_vmbus_drv;
- VMBUS_DRIVER_OBJECT *vmbus_drv_obj = &g_vmbus_drv.drv_obj;
+ struct vmbus_driver_object *vmbus_drv_obj = &g_vmbus_drv.drv_obj;
struct device_context *dev_ctx = &g_vmbus_drv.device_ctx;
@@ -421,7 +421,7 @@ Desc: Terminate the vmbus driver. This routine is opposite of vmbus_bus_init()
--*/
void vmbus_bus_exit(void)
{
- VMBUS_DRIVER_OBJECT *vmbus_drv_obj = &g_vmbus_drv.drv_obj;
+ struct vmbus_driver_object *vmbus_drv_obj = &g_vmbus_drv.drv_obj;
struct vmbus_driver_context *vmbus_drv_ctx = &g_vmbus_drv;
struct device_context *dev_ctx = &g_vmbus_drv.device_ctx;
@@ -459,7 +459,7 @@ Desc: Register a vmbus's child driver
--*/
int vmbus_child_driver_register(struct driver_context *driver_ctx)
{
- VMBUS_DRIVER_OBJECT *vmbus_drv_obj = &g_vmbus_drv.drv_obj;
+ struct vmbus_driver_object *vmbus_drv_obj = &g_vmbus_drv.drv_obj;
int ret;
DPRINT_ENTER(VMBUS_DRV);
@@ -513,7 +513,7 @@ Desc: Get the vmbus channel interface. This is invoked by child/client driver th
--*/
void vmbus_get_interface(VMBUS_CHANNEL_INTERFACE * interface)
{
- VMBUS_DRIVER_OBJECT *vmbus_drv_obj = &g_vmbus_drv.drv_obj;
+ struct vmbus_driver_object *vmbus_drv_obj = &g_vmbus_drv.drv_obj;
vmbus_drv_obj->GetChannelInterface(interface);
}
@@ -529,7 +529,7 @@ Desc: Get the vmbus child device info. This is invoked to display various device
static void vmbus_child_device_get_info(struct hv_device *device_obj,
DEVICE_INFO * device_info)
{
- VMBUS_DRIVER_OBJECT *vmbus_drv_obj = &g_vmbus_drv.drv_obj;
+ struct vmbus_driver_object *vmbus_drv_obj = &g_vmbus_drv.drv_obj;
vmbus_drv_obj->GetChannelInfo(device_obj, device_info);
}
@@ -1000,7 +1000,8 @@ Desc: Tasklet routine to handle hypervisor messages
--*/
static void vmbus_msg_dpc(unsigned long data)
{
- VMBUS_DRIVER_OBJECT *vmbus_drv_obj = (VMBUS_DRIVER_OBJECT *) data;
+ struct vmbus_driver_object *vmbus_drv_obj =
+ (struct vmbus_driver_object *)data;
DPRINT_ENTER(VMBUS_DRV);
@@ -1021,7 +1022,8 @@ Desc: Tasklet routine to handle hypervisor events
--*/
static void vmbus_event_dpc(unsigned long data)
{
- VMBUS_DRIVER_OBJECT *vmbus_drv_obj = (VMBUS_DRIVER_OBJECT *) data;
+ struct vmbus_driver_object *vmbus_drv_obj =
+ (struct vmbus_driver_object *)data;
DPRINT_ENTER(VMBUS_DRV);
@@ -1043,7 +1045,7 @@ Desc: ISR routine
static irqreturn_t vmbus_isr(int irq, void *dev_id)
{
int ret = 0;
- VMBUS_DRIVER_OBJECT *vmbus_driver_obj = &g_vmbus_drv.drv_obj;
+ struct vmbus_driver_object *vmbus_driver_obj = &g_vmbus_drv.drv_obj;
DPRINT_ENTER(VMBUS_DRV);
--
1.6.3.1.10.g659a0.dirty
More information about the devel
mailing list