Skip to content

Commit

Permalink
Staging: hv: vmbus_drv: remove vmbus_child_device_get_info
Browse files Browse the repository at this point in the history
Just make the call to get_channel_info() directly.

Cc: Haiyang Zhang <haiyangz@microsoft.com>
Cc: Hank Janssen <hjanssen@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Greg Kroah-Hartman committed Oct 20, 2010
1 parent e957bda commit a4e91ed
Showing 1 changed file with 1 addition and 14 deletions.
15 changes: 1 addition & 14 deletions drivers/staging/hv/vmbus_drv.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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-"
Expand Down Expand Up @@ -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.
Expand Down

0 comments on commit a4e91ed

Please sign in to comment.