diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2011-10-11 09:43:14 -0600 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-10-11 09:51:22 -0600 |
commit | 15b80d641793968605254c2bbb2aa9a10accb415 (patch) | |
tree | 7cdb5105af2a084ee4833a8074179e2b278956f2 | |
parent | 9f3e28e375a8d509a27efe89f3c8ea2a15aeb524 (diff) |
hv: remove struct hv_device_info from hyperv.h
This is only used/needed by the vmbus core code, so move it out of the
hyperv.h file and into the .c file that uses it.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r-- | drivers/hv/vmbus_drv.c | 19 | ||||
-rw-r--r-- | include/linux/hyperv.h | 18 |
2 files changed, 19 insertions, 18 deletions
diff --git a/drivers/hv/vmbus_drv.c b/drivers/hv/vmbus_drv.c index e648571a5b0..0c048dd8013 100644 --- a/drivers/hv/vmbus_drv.c +++ b/drivers/hv/vmbus_drv.c @@ -44,6 +44,25 @@ static struct tasklet_struct event_dpc; static struct completion probe_event; static int irq; +struct hv_device_info { + u32 chn_id; + u32 chn_state; + uuid_le chn_type; + uuid_le chn_instance; + + u32 monitor_id; + u32 server_monitor_pending; + u32 server_monitor_latency; + u32 server_monitor_conn_id; + u32 client_monitor_pending; + u32 client_monitor_latency; + u32 client_monitor_conn_id; + + struct hv_dev_port_info inbound; + struct hv_dev_port_info outbound; +}; + + static void get_channel_info(struct hv_device *device, struct hv_device_info *info) { diff --git a/include/linux/hyperv.h b/include/linux/hyperv.h index 240e1141cbb..12ec328481d 100644 --- a/include/linux/hyperv.h +++ b/include/linux/hyperv.h @@ -699,24 +699,6 @@ struct hv_dev_port_info { u32 bytes_avail_towrite; }; -struct hv_device_info { - u32 chn_id; - u32 chn_state; - uuid_le chn_type; - uuid_le chn_instance; - - u32 monitor_id; - u32 server_monitor_pending; - u32 server_monitor_latency; - u32 server_monitor_conn_id; - u32 client_monitor_pending; - u32 client_monitor_latency; - u32 client_monitor_conn_id; - - struct hv_dev_port_info inbound; - struct hv_dev_port_info outbound; -}; - /* Base driver object */ struct hv_driver { const char *name; |