Commit 345c4cc3 authored by K. Y. Srinivasan's avatar K. Y. Srinivasan Committed by Greg Kroah-Hartman

Staging: hv: netvsc: Use the newly introduced vmbus ID in netvsc driver

Use the newly introduced vmbus ID in netvsc driver. Also, do the associated
cleanup.
Signed-off-by: default avatarK. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: default avatarHaiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent d847b5fe
...@@ -35,15 +35,6 @@ ...@@ -35,15 +35,6 @@
/* Globals */ /* Globals */
static const char *driver_name = "netvsc"; static const char *driver_name = "netvsc";
/* {F8615163-DF3E-46c5-913F-F2D2F965ED0E} */
static const uuid_le netvsc_device_type = {
.b = {
0x63, 0x51, 0x61, 0xF8, 0x3E, 0xDF, 0xc5, 0x46,
0x91, 0x3F, 0xF2, 0xD2, 0xF9, 0x65, 0xED, 0x0E
}
};
static struct netvsc_device *alloc_net_device(struct hv_device *device) static struct netvsc_device *alloc_net_device(struct hv_device *device)
{ {
struct netvsc_device *net_device; struct netvsc_device *net_device;
...@@ -1009,7 +1000,6 @@ int netvsc_initialize(struct hv_driver *drv) ...@@ -1009,7 +1000,6 @@ int netvsc_initialize(struct hv_driver *drv)
{ {
drv->name = driver_name; drv->name = driver_name;
memcpy(&drv->dev_type, &netvsc_device_type, sizeof(uuid_le));
return 0; return 0;
} }
...@@ -413,8 +413,24 @@ static int netvsc_remove(struct hv_device *dev) ...@@ -413,8 +413,24 @@ static int netvsc_remove(struct hv_device *dev)
return 0; return 0;
} }
static const struct hv_vmbus_device_id id_table[] = {
{
/* Network guid */
.guid = {
0x63, 0x51, 0x61, 0xF8, 0x3E, 0xDF, 0xc5, 0x46,
0x91, 0x3F, 0xF2, 0xD2, 0xF9, 0x65, 0xED, 0x0E
}
},
{
.guid = { }
},
};
MODULE_DEVICE_TABLE(vmbus, id_table);
/* The one and only one */ /* The one and only one */
static struct hv_driver netvsc_drv = { static struct hv_driver netvsc_drv = {
.id_table = id_table,
.probe = netvsc_probe, .probe = netvsc_probe,
.remove = netvsc_remove, .remove = netvsc_remove,
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment