Staging: hv: blkvsc: Use the newly introduced vmbus ID in the blockvsc driver

Use the newly introduced vmbus ID in the blockvsc driver. Also, do
the associated cleanup.

Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/hv/blkvsc_drv.c b/drivers/staging/hv/blkvsc_drv.c
index 018b29394b00ff7bf8f2a6f1cb23e67ba101ee58..9b99387d98cc4ddf0a2aba473abccc120eef2b92 100644 (file)
--- a/drivers/staging/hv/blkvsc_drv.c
+++ b/drivers/staging/hv/blkvsc_drv.c
@@ -111,14 +111,6 @@ struct block_device_context {
 
 static const char *drv_name = "blkvsc";
 
-/* {32412632-86cb-44a2-9b5c-50d1417354f5} */
-static const uuid_le dev_type = {
-       .b = {
-               0x32, 0x26, 0x41, 0x32, 0xcb, 0x86, 0xa2, 0x44,
-               0x9b, 0x5c, 0x50, 0xd1, 0x41, 0x73, 0x54, 0xf5
-       }
-};
-
 /*
  * There is a circular dependency involving blkvsc_request_completion()
  * and blkvsc_do_request().
@@ -802,10 +794,24 @@ static void blkvsc_request(struct request_queue *queue)
        }
 }
 
+static const struct hv_vmbus_device_id id_table[] = {
+       {
+               /* IDE guid */
+               .guid = {
+                       0x32, 0x26, 0x41, 0x32, 0xcb, 0x86, 0xa2, 0x44,
+                       0x9b, 0x5c, 0x50, 0xd1, 0x41, 0x73, 0x54, 0xf5
+               }
+       },
+       {
+               .guid = { }
+       },
+};
 
+MODULE_DEVICE_TABLE(vmbus, id_table);
 
 /* The one and only one */
 static  struct hv_driver blkvsc_drv = {
+       .id_table = id_table,
        .probe =  blkvsc_probe,
        .remove =  blkvsc_remove,
        .shutdown = blkvsc_shutdown,
@@ -829,7 +835,6 @@ static int blkvsc_drv_init(void)
 
        BUILD_BUG_ON(sizeof(sector_t) != 8);
 
-       memcpy(&drv->dev_type, &dev_type, sizeof(uuid_le));
        drv->driver.name = drv_name;
 
        /* The driver belongs to vmbus */