|
@@ -107,12 +107,12 @@ static ssize_t vmbus_show_device_attr(struct device *dev,
|
|
|
struct device_attribute *dev_attr,
|
|
|
char *buf)
|
|
|
{
|
|
|
- struct hv_device *device_ctx = device_to_hv_device(dev);
|
|
|
+ struct hv_device *hv_dev = device_to_hv_device(dev);
|
|
|
struct hv_device_info device_info;
|
|
|
|
|
|
memset(&device_info, 0, sizeof(struct hv_device_info));
|
|
|
|
|
|
- get_channel_info(device_ctx, &device_info);
|
|
|
+ get_channel_info(hv_dev, &device_info);
|
|
|
|
|
|
if (!strcmp(dev_attr->attr.name, "class_id")) {
|
|
|
return sprintf(buf, "{%02x%02x%02x%02x-%02x%02x-%02x%02x-"
|
|
@@ -300,10 +300,10 @@ static int vmbus_match(struct device *device, struct device_driver *driver)
|
|
|
{
|
|
|
int match = 0;
|
|
|
struct hv_driver *drv = drv_to_hv_drv(driver);
|
|
|
- struct hv_device *device_ctx = device_to_hv_device(device);
|
|
|
+ struct hv_device *hv_dev = device_to_hv_device(device);
|
|
|
|
|
|
/* We found our driver ? */
|
|
|
- if (memcmp(&device_ctx->dev_type, &drv->dev_type,
|
|
|
+ if (memcmp(&hv_dev->dev_type, &drv->dev_type,
|
|
|
sizeof(struct hv_guid)) == 0)
|
|
|
match = 1;
|
|
|
|
|
@@ -387,9 +387,9 @@ static void vmbus_shutdown(struct device *child_device)
|
|
|
*/
|
|
|
static void vmbus_device_release(struct device *device)
|
|
|
{
|
|
|
- struct hv_device *device_ctx = device_to_hv_device(device);
|
|
|
+ struct hv_device *hv_dev = device_to_hv_device(device);
|
|
|
|
|
|
- kfree(device_ctx);
|
|
|
+ kfree(hv_dev);
|
|
|
|
|
|
}
|
|
|
|