diff options
Diffstat (limited to 'drivers/staging')
-rw-r--r-- | drivers/staging/hv/ChannelMgmt.c | 4 | ||||
-rw-r--r-- | drivers/staging/hv/Vmbus.c | 4 | ||||
-rw-r--r-- | drivers/staging/hv/VmbusPrivate.h | 4 | ||||
-rw-r--r-- | drivers/staging/hv/include/VmbusApi.h | 2 | ||||
-rw-r--r-- | drivers/staging/hv/vmbus_drv.c | 22 |
5 files changed, 19 insertions, 17 deletions
diff --git a/drivers/staging/hv/ChannelMgmt.c b/drivers/staging/hv/ChannelMgmt.c index f96cba7fa96..ec078bdfd40 100644 --- a/drivers/staging/hv/ChannelMgmt.c +++ b/drivers/staging/hv/ChannelMgmt.c | |||
@@ -284,8 +284,8 @@ VmbusChannelProcessOffer( | |||
284 | /* Start the process of binding this offer to the driver */ | 284 | /* Start the process of binding this offer to the driver */ |
285 | /* We need to set the DeviceObject field before calling VmbusChildDeviceAdd() */ | 285 | /* We need to set the DeviceObject field before calling VmbusChildDeviceAdd() */ |
286 | newChannel->DeviceObject = VmbusChildDeviceCreate( | 286 | newChannel->DeviceObject = VmbusChildDeviceCreate( |
287 | newChannel->OfferMsg.Offer.InterfaceType, | 287 | &newChannel->OfferMsg.Offer.InterfaceType, |
288 | newChannel->OfferMsg.Offer.InterfaceInstance, | 288 | &newChannel->OfferMsg.Offer.InterfaceInstance, |
289 | newChannel); | 289 | newChannel); |
290 | 290 | ||
291 | DPRINT_DBG(VMBUS, "child device object allocated - %p", newChannel->DeviceObject); | 291 | DPRINT_DBG(VMBUS, "child device object allocated - %p", newChannel->DeviceObject); |
diff --git a/drivers/staging/hv/Vmbus.c b/drivers/staging/hv/Vmbus.c index 56e8cbb07a7..58ed469c18c 100644 --- a/drivers/staging/hv/Vmbus.c +++ b/drivers/staging/hv/Vmbus.c | |||
@@ -231,8 +231,8 @@ Description: | |||
231 | 231 | ||
232 | --*/ | 232 | --*/ |
233 | 233 | ||
234 | struct hv_device *VmbusChildDeviceCreate(struct hv_guid DeviceType, | 234 | struct hv_device *VmbusChildDeviceCreate(struct hv_guid *DeviceType, |
235 | struct hv_guid DeviceInstance, | 235 | struct hv_guid *DeviceInstance, |
236 | void *Context) | 236 | void *Context) |
237 | { | 237 | { |
238 | VMBUS_DRIVER_OBJECT* vmbusDriver = (VMBUS_DRIVER_OBJECT*)gDriver; | 238 | VMBUS_DRIVER_OBJECT* vmbusDriver = (VMBUS_DRIVER_OBJECT*)gDriver; |
diff --git a/drivers/staging/hv/VmbusPrivate.h b/drivers/staging/hv/VmbusPrivate.h index fed03606800..928735e2ed9 100644 --- a/drivers/staging/hv/VmbusPrivate.h +++ b/drivers/staging/hv/VmbusPrivate.h | |||
@@ -103,8 +103,8 @@ extern struct VMBUS_CONNECTION gVmbusConnection; | |||
103 | 103 | ||
104 | /* General vmbus interface */ | 104 | /* General vmbus interface */ |
105 | 105 | ||
106 | struct hv_device *VmbusChildDeviceCreate(struct hv_guid deviceType, | 106 | struct hv_device *VmbusChildDeviceCreate(struct hv_guid *deviceType, |
107 | struct hv_guid deviceInstance, | 107 | struct hv_guid *deviceInstance, |
108 | void *context); | 108 | void *context); |
109 | 109 | ||
110 | int VmbusChildDeviceAdd(struct hv_device *Device); | 110 | int VmbusChildDeviceAdd(struct hv_device *Device); |
diff --git a/drivers/staging/hv/include/VmbusApi.h b/drivers/staging/hv/include/VmbusApi.h index e5a733790d0..d038ad8d8b1 100644 --- a/drivers/staging/hv/include/VmbusApi.h +++ b/drivers/staging/hv/include/VmbusApi.h | |||
@@ -76,7 +76,7 @@ typedef int (*PFN_ON_ISR)(struct hv_driver *drv); | |||
76 | typedef void (*PFN_ON_DPC)(struct hv_driver *drv); | 76 | typedef void (*PFN_ON_DPC)(struct hv_driver *drv); |
77 | typedef void (*PFN_GET_CHANNEL_OFFERS)(void); | 77 | typedef void (*PFN_GET_CHANNEL_OFFERS)(void); |
78 | 78 | ||
79 | typedef struct hv_device *(*PFN_ON_CHILDDEVICE_CREATE)(struct hv_guid DeviceType, struct hv_guid DeviceInstance, void *Context); | 79 | typedef struct hv_device *(*PFN_ON_CHILDDEVICE_CREATE)(struct hv_guid *DeviceType, struct hv_guid *DeviceInstance, void *Context); |
80 | typedef void (*PFN_ON_CHILDDEVICE_DESTROY)(struct hv_device *Device); | 80 | typedef void (*PFN_ON_CHILDDEVICE_DESTROY)(struct hv_device *Device); |
81 | typedef int (*PFN_ON_CHILDDEVICE_ADD)(struct hv_device *RootDevice, struct hv_device *ChildDevice); | 81 | typedef int (*PFN_ON_CHILDDEVICE_ADD)(struct hv_device *RootDevice, struct hv_device *ChildDevice); |
82 | typedef void (*PFN_ON_CHILDDEVICE_REMOVE)(struct hv_device *Device); | 82 | typedef void (*PFN_ON_CHILDDEVICE_REMOVE)(struct hv_device *Device); |
diff --git a/drivers/staging/hv/vmbus_drv.c b/drivers/staging/hv/vmbus_drv.c index f8620e2185b..5268b51347e 100644 --- a/drivers/staging/hv/vmbus_drv.c +++ b/drivers/staging/hv/vmbus_drv.c | |||
@@ -75,7 +75,7 @@ static irqreturn_t vmbus_isr(int irq, void* dev_id); | |||
75 | static void vmbus_device_release(struct device *device); | 75 | static void vmbus_device_release(struct device *device); |
76 | static void vmbus_bus_release(struct device *device); | 76 | static void vmbus_bus_release(struct device *device); |
77 | 77 | ||
78 | static struct hv_device *vmbus_child_device_create(struct hv_guid type, struct hv_guid instance, void* context); | 78 | static struct hv_device *vmbus_child_device_create(struct hv_guid *type, struct hv_guid *instance, void *context); |
79 | static void vmbus_child_device_destroy(struct hv_device *device_obj); | 79 | static void vmbus_child_device_destroy(struct hv_device *device_obj); |
80 | static int vmbus_child_device_register(struct hv_device *root_device_obj, struct hv_device *child_device_obj); | 80 | static int vmbus_child_device_register(struct hv_device *root_device_obj, struct hv_device *child_device_obj); |
81 | static void vmbus_child_device_unregister(struct hv_device *child_device_obj); | 81 | static void vmbus_child_device_unregister(struct hv_device *child_device_obj); |
@@ -565,7 +565,9 @@ Name: vmbus_child_device_create() | |||
565 | Desc: Creates and registers a new child device on the vmbus. | 565 | Desc: Creates and registers a new child device on the vmbus. |
566 | 566 | ||
567 | --*/ | 567 | --*/ |
568 | static struct hv_device *vmbus_child_device_create(struct hv_guid type, struct hv_guid instance, void* context) | 568 | static struct hv_device *vmbus_child_device_create(struct hv_guid *type, |
569 | struct hv_guid *instance, | ||
570 | void *context) | ||
569 | { | 571 | { |
570 | struct device_context *child_device_ctx; | 572 | struct device_context *child_device_ctx; |
571 | struct hv_device *child_device_obj; | 573 | struct hv_device *child_device_obj; |
@@ -586,14 +588,14 @@ static struct hv_device *vmbus_child_device_create(struct hv_guid type, struct h | |||
586 | "type {%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x%02x%02x}," | 588 | "type {%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x%02x%02x}," |
587 | "id {%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x%02x%02x}", | 589 | "id {%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x%02x%02x}", |
588 | &child_device_ctx->device, | 590 | &child_device_ctx->device, |
589 | type.data[3], type.data[2], type.data[1], type.data[0], | 591 | type->data[3], type->data[2], type->data[1], type->data[0], |
590 | type.data[5], type.data[4], type.data[7], type.data[6], | 592 | type->data[5], type->data[4], type->data[7], type->data[6], |
591 | type.data[8], type.data[9], type.data[10], type.data[11], | 593 | type->data[8], type->data[9], type->data[10], type->data[11], |
592 | type.data[12], type.data[13], type.data[14], type.data[15], | 594 | type->data[12], type->data[13], type->data[14], type->data[15], |
593 | instance.data[3], instance.data[2], instance.data[1], instance.data[0], | 595 | instance->data[3], instance->data[2], instance->data[1], instance->data[0], |
594 | instance.data[5], instance.data[4], instance.data[7], instance.data[6], | 596 | instance->data[5], instance->data[4], instance->data[7], instance->data[6], |
595 | instance.data[8], instance.data[9], instance.data[10], instance.data[11], | 597 | instance->data[8], instance->data[9], instance->data[10], instance->data[11], |
596 | instance.data[12], instance.data[13], instance.data[14], instance.data[15]); | 598 | instance->data[12], instance->data[13], instance->data[14], instance->data[15]); |
597 | 599 | ||
598 | child_device_obj = &child_device_ctx->device_obj; | 600 | child_device_obj = &child_device_ctx->device_obj; |
599 | child_device_obj->context = context; | 601 | child_device_obj->context = context; |