Revert "Drivers: hv: vmbus: Cleanup vmbus_set_event()"

BugLink: http://bugs.launchpad.net/bugs/1583357

This reverts commit 1454f3a3.

Favor upstream
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Acked-by: Brad Figg <brad.figg@canonical.com>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>

drivers/hv/connection.c

@@ -482,7 +482,7 @@ int vmbus_post_msg(void *buffer, size_t buflen)
 /*
  * vmbus_set_event - Send an event notification to the parent
  */
-void vmbus_set_event(struct vmbus_channel *channel)
+int vmbus_set_event(struct vmbus_channel *channel)
 {
 	u32 child_relid = channel->offermsg.child_relid;
 
@@ -493,5 +493,5 @@ void vmbus_set_event(struct vmbus_channel *channel)
 			(child_relid >> 5));
 	}
 
-	hv_do_hypercall(HVCALL_SIGNAL_EVENT, channel->sig_event, NULL);
+	return hv_signal_event(channel->sig_event);
 }

drivers/hv/hv.c

@@ -353,6 +353,22 @@ int hv_post_message(union hv_connection_id connection_id,
 	return status & 0xFFFF;
 }
 
+
+/*
+ * hv_signal_event -
+ * Signal an event on the specified connection using the hypervisor event IPC.
+ *
+ * This involves a hypercall.
+ */
+int hv_signal_event(void *con_id)
+{
+	u64 status;
+
+	status = hv_do_hypercall(HVCALL_SIGNAL_EVENT, con_id, NULL);
+
+	return status & 0xFFFF;
+}
+
 static int hv_ce_set_next_event(unsigned long delta,
 				struct clock_event_device *evt)
 {

drivers/hv/hyperv_vmbus.h

@@ -496,6 +496,8 @@ extern int hv_post_message(union hv_connection_id connection_id,
 			 enum hv_message_type message_type,
 			 void *payload, size_t payload_size);
 
+extern int hv_signal_event(void *con_id);
+
 extern int hv_synic_alloc(void);
 
 extern void hv_synic_free(void);
@@ -667,7 +669,7 @@ void vmbus_disconnect(void);
 
 int vmbus_post_msg(void *buffer, size_t buflen);
 
-void vmbus_set_event(struct vmbus_channel *channel);
+int vmbus_set_event(struct vmbus_channel *channel);
 
 void vmbus_on_event(unsigned long data);
 void vmbus_on_msg_dpc(unsigned long data);