diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2011-10-11 11:43:14 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-10-11 11:51:22 -0400 |
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 e648571a5b05..0c048dd8013f 100644 --- a/drivers/hv/vmbus_drv.c +++ b/drivers/hv/vmbus_drv.c | |||
@@ -44,6 +44,25 @@ static struct tasklet_struct event_dpc; | |||
44 | static struct completion probe_event; | 44 | static struct completion probe_event; |
45 | static int irq; | 45 | static int irq; |
46 | 46 | ||
47 | struct hv_device_info { | ||
48 | u32 chn_id; | ||
49 | u32 chn_state; | ||
50 | uuid_le chn_type; | ||
51 | uuid_le chn_instance; | ||
52 | |||
53 | u32 monitor_id; | ||
54 | u32 server_monitor_pending; | ||
55 | u32 server_monitor_latency; | ||
56 | u32 server_monitor_conn_id; | ||
57 | u32 client_monitor_pending; | ||
58 | u32 client_monitor_latency; | ||
59 | u32 client_monitor_conn_id; | ||
60 | |||
61 | struct hv_dev_port_info inbound; | ||
62 | struct hv_dev_port_info outbound; | ||
63 | }; | ||
64 | |||
65 | |||
47 | static void get_channel_info(struct hv_device *device, | 66 | static void get_channel_info(struct hv_device *device, |
48 | struct hv_device_info *info) | 67 | struct hv_device_info *info) |
49 | { | 68 | { |
diff --git a/include/linux/hyperv.h b/include/linux/hyperv.h index 240e1141cbbd..12ec328481de 100644 --- a/include/linux/hyperv.h +++ b/include/linux/hyperv.h | |||
@@ -699,24 +699,6 @@ struct hv_dev_port_info { | |||
699 | u32 bytes_avail_towrite; | 699 | u32 bytes_avail_towrite; |
700 | }; | 700 | }; |
701 | 701 | ||
702 | struct hv_device_info { | ||
703 | u32 chn_id; | ||
704 | u32 chn_state; | ||
705 | uuid_le chn_type; | ||
706 | uuid_le chn_instance; | ||
707 | |||
708 | u32 monitor_id; | ||
709 | u32 server_monitor_pending; | ||
710 | u32 server_monitor_latency; | ||
711 | u32 server_monitor_conn_id; | ||
712 | u32 client_monitor_pending; | ||
713 | u32 client_monitor_latency; | ||
714 | u32 client_monitor_conn_id; | ||
715 | |||
716 | struct hv_dev_port_info inbound; | ||
717 | struct hv_dev_port_info outbound; | ||
718 | }; | ||
719 | |||
720 | /* Base driver object */ | 702 | /* Base driver object */ |
721 | struct hv_driver { | 703 | struct hv_driver { |
722 | const char *name; | 704 | const char *name; |