diff options
| author | K. Y. Srinivasan | 2011-08-25 18:48:34 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2011-08-25 20:31:10 +0200 |
| commit | 345c4cc3b953a43464776701918e22c7e30cedd0 (patch) | |
| tree | d610f1955161690b9f0b0eac974a7f491cc44abc | |
| parent | Staging: hv: storvsc: Use the newly introduced vmbus ID in storvsc driver (diff) | |
| download | kernel-qcow2-linux-345c4cc3b953a43464776701918e22c7e30cedd0.tar.gz kernel-qcow2-linux-345c4cc3b953a43464776701918e22c7e30cedd0.tar.xz kernel-qcow2-linux-345c4cc3b953a43464776701918e22c7e30cedd0.zip | |
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: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | drivers/staging/hv/netvsc.c | 10 | ||||
| -rw-r--r-- | drivers/staging/hv/netvsc_drv.c | 16 |
2 files changed, 16 insertions, 10 deletions
diff --git a/drivers/staging/hv/netvsc.c b/drivers/staging/hv/netvsc.c index 1506b5346676..6f4541bcef89 100644 --- a/drivers/staging/hv/netvsc.c +++ b/drivers/staging/hv/netvsc.c @@ -35,15 +35,6 @@ /* Globals */ 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) { struct netvsc_device *net_device; @@ -1009,7 +1000,6 @@ int netvsc_initialize(struct hv_driver *drv) { drv->name = driver_name; - memcpy(&drv->dev_type, &netvsc_device_type, sizeof(uuid_le)); return 0; } diff --git a/drivers/staging/hv/netvsc_drv.c b/drivers/staging/hv/netvsc_drv.c index 61989f0d9f0d..2e25c957cfd0 100644 --- a/drivers/staging/hv/netvsc_drv.c +++ b/drivers/staging/hv/netvsc_drv.c @@ -413,8 +413,24 @@ static int netvsc_remove(struct hv_device *dev) 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 */ static struct hv_driver netvsc_drv = { + .id_table = id_table, .probe = netvsc_probe, .remove = netvsc_remove, }; |