From c37336628ce764d1d8b63102fbee0f1ec5e95bf9 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 20 Oct 2010 16:02:49 -0700 Subject: [PATCH] --- yaml --- r: 220409 b: refs/heads/master c: a4e91ed24bc6b68caa534a9de35f7fc770bffde9 h: refs/heads/master i: 220407: 3aa46e12657816f0bcfc6424599109034376d1c4 v: v3 --- [refs] | 2 +- trunk/drivers/staging/hv/vmbus_drv.c | 15 +-------------- 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/[refs] b/[refs] index 588eea5b53b5..190e4aa78d9b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e957bda0f4c88b29a027be23f4cc05f2abab2329 +refs/heads/master: a4e91ed24bc6b68caa534a9de35f7fc770bffde9 diff --git a/trunk/drivers/staging/hv/vmbus_drv.c b/trunk/drivers/staging/hv/vmbus_drv.c index 68d95eb7f929..8b3b14e5c37d 100644 --- a/trunk/drivers/staging/hv/vmbus_drv.c +++ b/trunk/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-" @@ -463,17 +461,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.