diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-21 09:05:27 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-21 09:05:27 -0700 |
commit | cae5b843c82d76e643d6822597a9ea2866e9b30d (patch) | |
tree | 4097bb390043c9345956cdef94c08b91b6609f6f /drivers/staging/hv/vmbus_drv.c | |
parent | Staging: hv: make *context a real pointer in struct hv_device (diff) | |
download | linux-dev-cae5b843c82d76e643d6822597a9ea2866e9b30d.tar.xz linux-dev-cae5b843c82d76e643d6822597a9ea2866e9b30d.zip |
Staging: hv: rename context to channel in struct hv_device
As it really is a channel, not a "context" name it so.
This also entailed making a few more functions typesafe as they were
sending a struct vmbus_channel pointer as a void pointer.
There are still a few more that need to be converted (the osd callbacks
are one), but this is good for now.
Cc: Haiyang Zhang <haiyangz@microsoft.com>
Cc: Hank Janssen <hjanssen@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/hv/vmbus_drv.c')
-rw-r--r-- | drivers/staging/hv/vmbus_drv.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/staging/hv/vmbus_drv.c b/drivers/staging/hv/vmbus_drv.c index 1e0a1de8261d..92ba95c7c6d6 100644 --- a/drivers/staging/hv/vmbus_drv.c +++ b/drivers/staging/hv/vmbus_drv.c @@ -71,7 +71,7 @@ static void vmbus_bus_release(struct device *device); static struct hv_device *vmbus_child_device_create(struct hv_guid *type, struct hv_guid *instance, - void *context); + struct vmbus_channel *channel); static void vmbus_child_device_destroy(struct hv_device *device_obj); static int vmbus_child_device_register(struct hv_device *root_device_obj, struct hv_device *child_device_obj); @@ -134,10 +134,10 @@ static void get_channel_info(struct hv_device *device, { struct vmbus_channel_debug_info debug_info; - if (!device->context) + if (!device->channel) return; - vmbus_get_debug_info(device->context, &debug_info); + vmbus_get_debug_info(device->channel, &debug_info); info->ChannelId = debug_info.RelId; info->ChannelState = debug_info.State; @@ -508,7 +508,7 @@ EXPORT_SYMBOL(vmbus_get_interface); */ static struct hv_device *vmbus_child_device_create(struct hv_guid *type, struct hv_guid *instance, - void *context) + struct vmbus_channel *channel) { struct vm_device *child_device_ctx; struct hv_device *child_device_obj; @@ -541,7 +541,7 @@ static struct hv_device *vmbus_child_device_create(struct hv_guid *type, instance->data[14], instance->data[15]); child_device_obj = &child_device_ctx->device_obj; - child_device_obj->context = context; + child_device_obj->channel = channel; memcpy(&child_device_obj->deviceType, type, sizeof(struct hv_guid)); memcpy(&child_device_obj->deviceInstance, instance, sizeof(struct hv_guid)); |