staging: hv: Convert camel cased struct fields in vmbus_api.h to lower cases

[mv-sheeva.git] / drivers / staging / hv / blkvsc.c

diff --git a/drivers/staging/hv/blkvsc.c b/drivers/staging/hv/blkvsc.c
index 11a2523a74e3ce49c25cc655ada49820e9065713..b0e07c1fc4c89b7e453519bc7d32ca372c85eb94 100644 (file)
--- a/drivers/staging/hv/blkvsc.c
+++ b/drivers/staging/hv/blkvsc.c
@@ -51,13 +51,13 @@ static int blk_vsc_on_device_add(struct hv_device *device, void *additional_info
         * id. For IDE devices, the device instance id is formatted as
         * <bus id> * - <device id> - 8899 - 000000000000.
         */
-       device_info->path_id = device->deviceInstance.data[3] << 24 |
-                            device->deviceInstance.data[2] << 16 |
-                            device->deviceInstance.data[1] << 8  |
-                            device->deviceInstance.data[0];
+       device_info->path_id = device->dev_instance.data[3] << 24 |
+                            device->dev_instance.data[2] << 16 |
+                            device->dev_instance.data[1] << 8  |
+                            device->dev_instance.data[0];
 
-       device_info->target_id = device->deviceInstance.data[5] << 8 |
-                              device->deviceInstance.data[4];
+       device_info->target_id = device->dev_instance.data[5] << 8 |
+                              device->dev_instance.data[4];
 
        return ret;
 }
@@ -73,7 +73,7 @@ int blk_vsc_initialize(struct hv_driver *driver)
        /* ASSERT(stor_driver->RingBufferSize >= (PAGE_SIZE << 1)); */
 
        driver->name = g_blk_driver_name;
-       memcpy(&driver->deviceType, &g_blk_device_type, sizeof(struct hv_guid));
+       memcpy(&driver->dev_type, &g_blk_device_type, sizeof(struct hv_guid));
 
        stor_driver->request_ext_size = sizeof(struct storvsc_request_extension);
 
@@ -93,9 +93,9 @@ int blk_vsc_initialize(struct hv_driver *driver)
                    stor_driver->max_outstanding_req_per_channel);
 
        /* Setup the dispatch table */
-       stor_driver->base.OnDeviceAdd = blk_vsc_on_device_add;
-       stor_driver->base.OnDeviceRemove = stor_vsc_on_device_remove;
-       stor_driver->base.OnCleanup = stor_vsc_on_cleanup;
+       stor_driver->base.dev_add = blk_vsc_on_device_add;
+       stor_driver->base.dev_rm = stor_vsc_on_device_remove;
+       stor_driver->base.cleanup = stor_vsc_on_cleanup;
        stor_driver->on_io_request = stor_vsc_on_io_request;
 
        return ret;