Merge branches 'for-32/i2c/omap-v4', 'for-32/i2c/imx-dt', 'for-32/i2c/eg20t-v4',...

[pandora-kernel.git] / drivers / hv / vmbus_drv.c

diff --git a/drivers/hv/vmbus_drv.c b/drivers/hv/vmbus_drv.c
index bb9f205..0c048dd 100644 (file)
--- a/drivers/hv/vmbus_drv.c
+++ b/drivers/hv/vmbus_drv.c
@@ -41,13 +41,28 @@ static struct acpi_device  *hv_acpi_dev;
 
 static struct tasklet_struct msg_dpc;
 static struct tasklet_struct event_dpc;
-
-unsigned int vmbus_loglevel = (ALL_MODULES << 16 | INFO_LVL);
-EXPORT_SYMBOL(vmbus_loglevel);
-
 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)
 {
@@ -767,6 +782,5 @@ cleanup:
 
 MODULE_LICENSE("GPL");
 MODULE_VERSION(HV_DRV_VERSION);
-module_param(vmbus_loglevel, int, S_IRUGO|S_IWUSR);
 
 module_init(hv_acpi_init);