diff options
author | Haiyang Zhang <haiyangz@microsoft.com> | 2011-01-26 15:12:10 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-01-31 16:42:48 -0500 |
commit | 646f1ea3796c7bd46587e4a9b58f64cf005efdfe (patch) | |
tree | 6da91c53316d0620504cd67fe25ac238fdfbd2b4 /drivers/staging/hv | |
parent | adf874cb355fcc3293aa489f427f682e708cf586 (diff) |
staging: hv: Convert camel cased functions in vmbus_drv.c to lower cases
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Hank Janssen <hjanssen@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/hv')
-rw-r--r-- | drivers/staging/hv/channel_mgmt.c | 4 | ||||
-rw-r--r-- | drivers/staging/hv/vmbus_drv.c | 22 | ||||
-rw-r--r-- | drivers/staging/hv/vmbus_private.h | 6 |
3 files changed, 16 insertions, 16 deletions
diff --git a/drivers/staging/hv/channel_mgmt.c b/drivers/staging/hv/channel_mgmt.c index 0ce8f54cfc2..732a457c3b4 100644 --- a/drivers/staging/hv/channel_mgmt.c +++ b/drivers/staging/hv/channel_mgmt.c | |||
@@ -391,7 +391,7 @@ static void vmbus_process_offer(struct work_struct *work) | |||
391 | /* | 391 | /* |
392 | * Start the process of binding this offer to the driver | 392 | * Start the process of binding this offer to the driver |
393 | * We need to set the DeviceObject field before calling | 393 | * We need to set the DeviceObject field before calling |
394 | * VmbusChildDeviceAdd() | 394 | * vmbus_child_dev_add() |
395 | */ | 395 | */ |
396 | newchannel->device_obj = vmbus_child_device_create( | 396 | newchannel->device_obj = vmbus_child_device_create( |
397 | &newchannel->offermsg.offer.InterfaceType, | 397 | &newchannel->offermsg.offer.InterfaceType, |
@@ -406,7 +406,7 @@ static void vmbus_process_offer(struct work_struct *work) | |||
406 | * binding which eventually invokes the device driver's AddDevice() | 406 | * binding which eventually invokes the device driver's AddDevice() |
407 | * method. | 407 | * method. |
408 | */ | 408 | */ |
409 | ret = VmbusChildDeviceAdd(newchannel->device_obj); | 409 | ret = vmbus_child_dev_add(newchannel->device_obj); |
410 | if (ret != 0) { | 410 | if (ret != 0) { |
411 | DPRINT_ERR(VMBUS, | 411 | DPRINT_ERR(VMBUS, |
412 | "unable to add child device object (relid %d)", | 412 | "unable to add child device object (relid %d)", |
diff --git a/drivers/staging/hv/vmbus_drv.c b/drivers/staging/hv/vmbus_drv.c index 99686f06d2f..0c0aadbea1f 100644 --- a/drivers/staging/hv/vmbus_drv.c +++ b/drivers/staging/hv/vmbus_drv.c | |||
@@ -148,17 +148,17 @@ static const struct hv_guid device_id = { | |||
148 | static struct hv_device *vmbus_device; /* vmbus root device */ | 148 | static struct hv_device *vmbus_device; /* vmbus root device */ |
149 | 149 | ||
150 | /* | 150 | /* |
151 | * VmbusChildDeviceAdd - Registers the child device with the vmbus | 151 | * vmbus_child_dev_add - Registers the child device with the vmbus |
152 | */ | 152 | */ |
153 | int VmbusChildDeviceAdd(struct hv_device *child_dev) | 153 | int vmbus_child_dev_add(struct hv_device *child_dev) |
154 | { | 154 | { |
155 | return vmbus_child_device_register(vmbus_device, child_dev); | 155 | return vmbus_child_device_register(vmbus_device, child_dev); |
156 | } | 156 | } |
157 | 157 | ||
158 | /* | 158 | /* |
159 | * VmbusOnDeviceAdd - Callback when the root bus device is added | 159 | * vmbus_dev_add - Callback when the root bus device is added |
160 | */ | 160 | */ |
161 | static int VmbusOnDeviceAdd(struct hv_device *dev, void *info) | 161 | static int vmbus_dev_add(struct hv_device *dev, void *info) |
162 | { | 162 | { |
163 | u32 *irqvector = info; | 163 | u32 *irqvector = info; |
164 | int ret; | 164 | int ret; |
@@ -181,9 +181,9 @@ static int VmbusOnDeviceAdd(struct hv_device *dev, void *info) | |||
181 | } | 181 | } |
182 | 182 | ||
183 | /* | 183 | /* |
184 | * VmbusOnDeviceRemove - Callback when the root bus device is removed | 184 | * vmbus_dev_rm - Callback when the root bus device is removed |
185 | */ | 185 | */ |
186 | static int VmbusOnDeviceRemove(struct hv_device *dev) | 186 | static int vmbus_dev_rm(struct hv_device *dev) |
187 | { | 187 | { |
188 | int ret = 0; | 188 | int ret = 0; |
189 | 189 | ||
@@ -194,9 +194,9 @@ static int VmbusOnDeviceRemove(struct hv_device *dev) | |||
194 | } | 194 | } |
195 | 195 | ||
196 | /* | 196 | /* |
197 | * VmbusOnCleanup - Perform any cleanup when the driver is removed | 197 | * vmbus_cleanup - Perform any cleanup when the driver is removed |
198 | */ | 198 | */ |
199 | static void VmbusOnCleanup(struct hv_driver *drv) | 199 | static void vmbus_cleanup(struct hv_driver *drv) |
200 | { | 200 | { |
201 | /* struct vmbus_driver *driver = (struct vmbus_driver *)drv; */ | 201 | /* struct vmbus_driver *driver = (struct vmbus_driver *)drv; */ |
202 | 202 | ||
@@ -482,9 +482,9 @@ static int vmbus_bus_init(void) | |||
482 | memcpy(&driver->deviceType, &device_type, sizeof(struct hv_guid)); | 482 | memcpy(&driver->deviceType, &device_type, sizeof(struct hv_guid)); |
483 | 483 | ||
484 | /* Setup dispatch table */ | 484 | /* Setup dispatch table */ |
485 | driver->OnDeviceAdd = VmbusOnDeviceAdd; | 485 | driver->OnDeviceAdd = vmbus_dev_add; |
486 | driver->OnDeviceRemove = VmbusOnDeviceRemove; | 486 | driver->OnDeviceRemove = vmbus_dev_rm; |
487 | driver->OnCleanup = VmbusOnCleanup; | 487 | driver->OnCleanup = vmbus_cleanup; |
488 | 488 | ||
489 | /* Hypervisor initialization...setup hypercall page..etc */ | 489 | /* Hypervisor initialization...setup hypercall page..etc */ |
490 | ret = hv_init(); | 490 | ret = hv_init(); |
diff --git a/drivers/staging/hv/vmbus_private.h b/drivers/staging/hv/vmbus_private.h index e3b0663b8db..0ab404ed360 100644 --- a/drivers/staging/hv/vmbus_private.h +++ b/drivers/staging/hv/vmbus_private.h | |||
@@ -102,11 +102,11 @@ extern struct VMBUS_CONNECTION vmbus_connection; | |||
102 | 102 | ||
103 | /* General vmbus interface */ | 103 | /* General vmbus interface */ |
104 | 104 | ||
105 | struct hv_device *vmbus_child_device_create(struct hv_guid *deviceType, | 105 | struct hv_device *vmbus_child_device_create(struct hv_guid *type, |
106 | struct hv_guid *deviceInstance, | 106 | struct hv_guid *instance, |
107 | struct vmbus_channel *channel); | 107 | struct vmbus_channel *channel); |
108 | 108 | ||
109 | int VmbusChildDeviceAdd(struct hv_device *Device); | 109 | int vmbus_child_dev_add(struct hv_device *device); |
110 | int vmbus_child_device_register(struct hv_device *root_device_obj, | 110 | int vmbus_child_device_register(struct hv_device *root_device_obj, |
111 | struct hv_device *child_device_obj); | 111 | struct hv_device *child_device_obj); |
112 | void vmbus_child_device_unregister(struct hv_device *device_obj); | 112 | void vmbus_child_device_unregister(struct hv_device *device_obj); |