From a4e91ed24bc6b68caa534a9de35f7fc770bffde9 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 20 Oct 2010 16:02:49 -0700 Subject: [PATCH] Staging: hv: vmbus_drv: remove vmbus_child_device_get_info Just make the call to get_channel_info() directly. Cc: Haiyang Zhang Cc: Hank Janssen Signed-off-by: Greg Kroah-Hartman --- drivers/staging/hv/vmbus_drv.c | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/drivers/staging/hv/vmbus_drv.c b/drivers/staging/hv/vmbus_drv.c index 68d95eb7f92..8b3b14e5c37 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); static int vmbus_child_device_register(struct hv_device *root_device_obj, struct hv_device *child_device_obj); static void vmbus_child_device_unregister(struct hv_device *child_device_obj); -static void vmbus_child_device_get_info(struct hv_device *device_obj, - struct hv_device_info *device_info); static ssize_t vmbus_show_device_attr(struct device *dev, struct device_attribute *dev_attr, char *buf); @@ -146,7 +144,7 @@ static ssize_t vmbus_show_device_attr(struct device *dev, memset(&device_info, 0, sizeof(struct hv_device_info)); - vmbus_child_device_get_info(&device_ctx->device_obj, &device_info); + get_channel_info(&device_ctx->device_obj, &device_info); if (!strcmp(dev_attr->attr.name, "class_id")) { return sprintf(buf, "{%02x%02x%02x%02x-%02x%02x-%02x%02x-" @@ -464,17 +462,6 @@ void vmbus_get_interface(struct vmbus_channel_interface *interface) EXPORT_SYMBOL(vmbus_get_interface); /* - * vmbus_child_device_get_info - Get the vmbus child device info. - * - * This is invoked to display various device attributes in sysfs. - */ -static void vmbus_child_device_get_info(struct hv_device *device_obj, - struct hv_device_info *device_info) -{ - get_channel_info(device_obj, device_info); -} - -/* * vmbus_child_device_create - Creates and registers a new child device * on the vmbus. */ -- 2.11.4.GIT