Staging: hv: Replace struct hv_guid with the uuid type already defined in Linux

[deliverable/linux.git] / drivers / staging / hv / blkvsc_drv.c

diff --git a/drivers/staging/hv/blkvsc_drv.c b/drivers/staging/hv/blkvsc_drv.c
index d286b2223181623d284a8bd9b17ecce5445a899c..018b29394b00ff7bf8f2a6f1cb23e67ba101ee58 100644 (file)
--- a/drivers/staging/hv/blkvsc_drv.c
+++ b/drivers/staging/hv/blkvsc_drv.c
@@ -112,8 +112,8 @@ struct block_device_context {
 static const char *drv_name = "blkvsc";
 
 /* {32412632-86cb-44a2-9b5c-50d1417354f5} */
-static const struct hv_guid dev_type = {
-       .data = {
+static const uuid_le dev_type = {
+       .b = {
                0x32, 0x26, 0x41, 0x32, 0xcb, 0x86, 0xa2, 0x44,
                0x9b, 0x5c, 0x50, 0xd1, 0x41, 0x73, 0x54, 0xf5
        }
@@ -155,13 +155,13 @@ static int blkvsc_device_add(struct hv_device *device,
         * id. For IDE devices, the device instance id is formatted as
         * <bus id> * - <device id> - 8899 - 000000000000.
         */
-       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->path_id = device->dev_instance.b[3] << 24 |
+                            device->dev_instance.b[2] << 16 |
+                            device->dev_instance.b[1] << 8  |
+                            device->dev_instance.b[0];
 
-       device_info->target_id = device->dev_instance.data[5] << 8 |
-                              device->dev_instance.data[4];
+       device_info->target_id = device->dev_instance.b[5] << 8 |
+                              device->dev_instance.b[4];
 
        return ret;
 }
@@ -829,7 +829,7 @@ static int blkvsc_drv_init(void)
 
        BUILD_BUG_ON(sizeof(sector_t) != 8);
 
-       memcpy(&drv->dev_type, &dev_type, sizeof(struct hv_guid));
+       memcpy(&drv->dev_type, &dev_type, sizeof(uuid_le));
        drv->driver.name = drv_name;
 
        /* The driver belongs to vmbus */