aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/staging/hv/vmbus_drv.c15
1 files changed, 1 insertions, 14 deletions
diff --git a/drivers/staging/hv/vmbus_drv.c b/drivers/staging/hv/vmbus_drv.c
index 68d95eb7f929..8b3b14e5c37d 100644
--- a/drivers/staging/hv/vmbus_drv.c
+++ b/drivers/staging/hv/vmbus_drv.c
@@ -76,8 +76,6 @@ static void vmbus_child_device_destroy(struct hv_device *device_obj);
76static int vmbus_child_device_register(struct hv_device *root_device_obj, 76static int vmbus_child_device_register(struct hv_device *root_device_obj,
77 struct hv_device *child_device_obj); 77 struct hv_device *child_device_obj);
78static void vmbus_child_device_unregister(struct hv_device *child_device_obj); 78static void vmbus_child_device_unregister(struct hv_device *child_device_obj);
79static void vmbus_child_device_get_info(struct hv_device *device_obj,
80 struct hv_device_info *device_info);
81static ssize_t vmbus_show_device_attr(struct device *dev, 79static ssize_t vmbus_show_device_attr(struct device *dev,
82 struct device_attribute *dev_attr, 80 struct device_attribute *dev_attr,
83 char *buf); 81 char *buf);
@@ -146,7 +144,7 @@ static ssize_t vmbus_show_device_attr(struct device *dev,
146 144
147 memset(&device_info, 0, sizeof(struct hv_device_info)); 145 memset(&device_info, 0, sizeof(struct hv_device_info));
148 146
149 vmbus_child_device_get_info(&device_ctx->device_obj, &device_info); 147 get_channel_info(&device_ctx->device_obj, &device_info);
150 148
151 if (!strcmp(dev_attr->attr.name, "class_id")) { 149 if (!strcmp(dev_attr->attr.name, "class_id")) {
152 return sprintf(buf, "{%02x%02x%02x%02x-%02x%02x-%02x%02x-" 150 return sprintf(buf, "{%02x%02x%02x%02x-%02x%02x-%02x%02x-"
@@ -464,17 +462,6 @@ void vmbus_get_interface(struct vmbus_channel_interface *interface)
464EXPORT_SYMBOL(vmbus_get_interface); 462EXPORT_SYMBOL(vmbus_get_interface);
465 463
466/* 464/*
467 * vmbus_child_device_get_info - Get the vmbus child device info.
468 *
469 * This is invoked to display various device attributes in sysfs.
470 */
471static void vmbus_child_device_get_info(struct hv_device *device_obj,
472 struct hv_device_info *device_info)
473{
474 get_channel_info(device_obj, device_info);
475}
476
477/*
478 * vmbus_child_device_create - Creates and registers a new child device 465 * vmbus_child_device_create - Creates and registers a new child device
479 * on the vmbus. 466 * on the vmbus.
480 */ 467 */