diff options
| author | K. Y. Srinivasan <kys@microsoft.com> | 2015-12-22 00:12:20 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-02-08 06:32:57 +0100 |
| commit | 1b807e1011af46a595ba46c75ad5e20ad7177af7 (patch) | |
| tree | d0db61ca35aaf98c17d64bb46282a181050c7063 /drivers/hv | |
| parent | goldfish: locking bugs in goldfish_pipe_read_write() (diff) | |
| download | linux-1b807e1011af46a595ba46c75ad5e20ad7177af7.tar.xz linux-1b807e1011af46a595ba46c75ad5e20ad7177af7.zip | |
Drivers: hv: vmbus: Cleanup vmbus_set_event()
Cleanup vmbus_set_event() by inlining the hypercall to post
the event and since the return value of vmbus_set_event() is not checked,
make it void. As part of this cleanup, get rid of the function
hv_signal_event() as it is only callled from vmbus_set_event().
Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/hv')
| -rw-r--r-- | drivers/hv/connection.c | 4 | ||||
| -rw-r--r-- | drivers/hv/hv.c | 16 | ||||
| -rw-r--r-- | drivers/hv/hyperv_vmbus.h | 4 |
3 files changed, 3 insertions, 21 deletions
diff --git a/drivers/hv/connection.c b/drivers/hv/connection.c index 3dc5a9c7fad6..4a320e60641a 100644 --- a/drivers/hv/connection.c +++ b/drivers/hv/connection.c @@ -474,7 +474,7 @@ int vmbus_post_msg(void *buffer, size_t buflen) /* * vmbus_set_event - Send an event notification to the parent */ -int vmbus_set_event(struct vmbus_channel *channel) +void vmbus_set_event(struct vmbus_channel *channel) { u32 child_relid = channel->offermsg.child_relid; @@ -485,5 +485,5 @@ int vmbus_set_event(struct vmbus_channel *channel) (child_relid >> 5)); } - return hv_signal_event(channel->sig_event); + hv_do_hypercall(HVCALL_SIGNAL_EVENT, channel->sig_event, NULL); } diff --git a/drivers/hv/hv.c b/drivers/hv/hv.c index 11bca51ef5ff..1c677d0f16d6 100644 --- a/drivers/hv/hv.c +++ b/drivers/hv/hv.c @@ -337,22 +337,6 @@ 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) { diff --git a/drivers/hv/hyperv_vmbus.h b/drivers/hv/hyperv_vmbus.h index 4ebc796b4f33..ac7aa303c37d 100644 --- a/drivers/hv/hyperv_vmbus.h +++ b/drivers/hv/hyperv_vmbus.h @@ -501,8 +501,6 @@ 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); @@ -650,7 +648,7 @@ void vmbus_disconnect(void); int vmbus_post_msg(void *buffer, size_t buflen); -int vmbus_set_event(struct vmbus_channel *channel); +void vmbus_set_event(struct vmbus_channel *channel); void vmbus_on_event(unsigned long data); |