diff options
| author | K. Y. Srinivasan <kys@microsoft.com> | 2011-09-13 10:59:37 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-09-16 20:06:01 +0200 |
| commit | 3037a7b61fa63160f2bd76555aa9ae59c6f71faf (patch) | |
| tree | 5530af826a626178bf1e85b403e640ecc8b6c240 /drivers/staging/hv | |
| parent | 25bb6c0a94ddd9eb486e41db87466615fad18036 (diff) | |
| download | op-kernel-dev-3037a7b61fa63160f2bd76555aa9ae59c6f71faf.zip op-kernel-dev-3037a7b61fa63160f2bd76555aa9ae59c6f71faf.tar.gz | |
Staging: hv: vmbus: Introduce a utility function to match hv_vmbus_device_id
Introduce a utility function to match hv_vmbus_device_id.
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>
Diffstat (limited to 'drivers/staging/hv')
| -rw-r--r-- | drivers/staging/hv/vmbus_drv.c | 23 |
1 files changed, 18 insertions, 5 deletions
diff --git a/drivers/staging/hv/vmbus_drv.c b/drivers/staging/hv/vmbus_drv.c index 375e451..77f4373 100644 --- a/drivers/staging/hv/vmbus_drv.c +++ b/drivers/staging/hv/vmbus_drv.c @@ -272,6 +272,22 @@ static inline bool is_null_guid(const __u8 *guid) return true; } +/* + * Return a matching hv_vmbus_device_id pointer. + * If there is no match, return NULL. + */ +static const struct hv_vmbus_device_id *hv_vmbus_get_id( + const struct hv_vmbus_device_id *id, + __u8 *guid) +{ + for (; !is_null_guid(id->guid); id++) + if (!memcmp(&id->guid, guid, sizeof(uuid_le))) + return id; + + return NULL; +} + + /* * vmbus_match - Attempt to match the specified device to the specified driver @@ -280,12 +296,9 @@ static int vmbus_match(struct device *device, struct device_driver *driver) { struct hv_driver *drv = drv_to_hv_drv(driver); struct hv_device *hv_dev = device_to_hv_device(device); - const struct hv_vmbus_device_id *id_array = drv->id_table; - for (; !is_null_guid(id_array->guid); id_array++) - if (!memcmp(&id_array->guid, &hv_dev->dev_type.b, - sizeof(uuid_le))) - return 1; + if (hv_vmbus_get_id(drv->id_table, hv_dev->dev_type.b)) + return 1; return 0; } |
