Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

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

diff --git a/drivers/staging/hv/blkvsc.c b/drivers/staging/hv/blkvsc.c
index d5b0abd771ab2d4e5b0a0a7734a6637a9651342f..bc16d9172eb28261ef5ad6b5587751c1e22726b2 100644 (file)
--- a/drivers/staging/hv/blkvsc.c
+++ b/drivers/staging/hv/blkvsc.c
@@ -25,24 +25,24 @@
 #include "osd.h"
 #include "storvsc.c"
 
-static const char *gBlkDriverName = "blkvsc";
+static const char *g_blk_driver_name = "blkvsc";
 
 /* {32412632-86cb-44a2-9b5c-50d1417354f5} */
-static const struct hv_guid gBlkVscDeviceType = {
+static const struct hv_guid g_blk_device_type = {
        .data = {
                0x32, 0x26, 0x41, 0x32, 0xcb, 0x86, 0xa2, 0x44,
                0x9b, 0x5c, 0x50, 0xd1, 0x41, 0x73, 0x54, 0xf5
        }
 };
 
-static int BlkVscOnDeviceAdd(struct hv_device *Device, void *AdditionalInfo)
+static int blk_vsc_on_device_add(struct hv_device *device, void *additional_info)
 {
-       struct storvsc_device_info *deviceInfo;
+       struct storvsc_device_info *device_info;
        int ret = 0;
 
-       deviceInfo = (struct storvsc_device_info *)AdditionalInfo;
+       device_info = (struct storvsc_device_info *)additional_info;
 
-       ret = StorVscOnDeviceAdd(Device, AdditionalInfo);
+       ret = stor_vsc_on_device_add(device, additional_info);
        if (ret != 0)
                return ret;
 
@@ -51,31 +51,31 @@ static int BlkVscOnDeviceAdd(struct hv_device *Device, void *AdditionalInfo)
         * id. For IDE devices, the device instance id is formatted as
         * <bus id> * - <device id> - 8899 - 000000000000.
         */
-       deviceInfo->PathId = Device->deviceInstance.data[3] << 24 |
-                            Device->deviceInstance.data[2] << 16 |
-                            Device->deviceInstance.data[1] << 8  |
-                            Device->deviceInstance.data[0];
+       device_info->path_id = device->deviceInstance.data[3] << 24 |
+                            device->deviceInstance.data[2] << 16 |
+                            device->deviceInstance.data[1] << 8  |
+                            device->deviceInstance.data[0];
 
-       deviceInfo->TargetId = Device->deviceInstance.data[5] << 8 |
-                              Device->deviceInstance.data[4];
+       device_info->target_id = device->deviceInstance.data[5] << 8 |
+                              device->deviceInstance.data[4];
 
        return ret;
 }
 
-int BlkVscInitialize(struct hv_driver *Driver)
+int blk_vsc_initialize(struct hv_driver *driver)
 {
-       struct storvsc_driver_object *storDriver;
+       struct storvsc_driver_object *stor_driver;
        int ret = 0;
 
-       storDriver = (struct storvsc_driver_object *)Driver;
+       stor_driver = (struct storvsc_driver_object *)driver;
 
        /* Make sure we are at least 2 pages since 1 page is used for control */
-       /* ASSERT(storDriver->RingBufferSize >= (PAGE_SIZE << 1)); */
+       /* ASSERT(stor_driver->RingBufferSize >= (PAGE_SIZE << 1)); */
 
-       Driver->name = gBlkDriverName;
-       memcpy(&Driver->deviceType, &gBlkVscDeviceType, sizeof(struct hv_guid));
+       driver->name = g_blk_driver_name;
+       memcpy(&driver->deviceType, &g_blk_device_type, sizeof(struct hv_guid));
 
-       storDriver->RequestExtSize = sizeof(struct storvsc_request_extension);
+       stor_driver->request_ext_size = sizeof(struct storvsc_request_extension);
 
        /*
         * Divide the ring buffer data size (which is 1 page less than the ring
@@ -83,20 +83,20 @@ int BlkVscInitialize(struct hv_driver *Driver)
         * by the max request size (which is
         * vmbus_channel_packet_multipage_buffer + struct vstor_packet + u64)
         */
-       storDriver->MaxOutstandingRequestsPerChannel =
-               ((storDriver->RingBufferSize - PAGE_SIZE) /
+       stor_driver->max_outstanding_req_per_channel =
+               ((stor_driver->ring_buffer_size - PAGE_SIZE) /
                  ALIGN_UP(MAX_MULTIPAGE_BUFFER_PACKET +
                           sizeof(struct vstor_packet) + sizeof(u64),
                           sizeof(u64)));
 
        DPRINT_INFO(BLKVSC, "max io outstd %u",
-                   storDriver->MaxOutstandingRequestsPerChannel);
+                   stor_driver->max_outstanding_req_per_channel);
 
        /* Setup the dispatch table */
-       storDriver->Base.OnDeviceAdd = BlkVscOnDeviceAdd;
-       storDriver->Base.OnDeviceRemove = StorVscOnDeviceRemove;
-       storDriver->Base.OnCleanup = StorVscOnCleanup;
-       storDriver->OnIORequest = StorVscOnIORequest;
+       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->on_io_request = stor_vsc_on_io_request;
 
        return ret;
 }