diff options
| -rw-r--r-- | drivers/staging/hv/channel.c | 8 | ||||
| -rw-r--r-- | drivers/staging/hv/ring_buffer.c | 4 | ||||
| -rw-r--r-- | drivers/staging/hv/ring_buffer.h | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/drivers/staging/hv/channel.c b/drivers/staging/hv/channel.c index 43e54b5..44b81e8 100644 --- a/drivers/staging/hv/channel.c +++ b/drivers/staging/hv/channel.c @@ -292,8 +292,8 @@ Cleanup: return err; errorout: - ringbuffer_cleanup(&newchannel->outbound); - ringbuffer_cleanup(&newchannel->inbound); + hv_ringbuffer_cleanup(&newchannel->outbound); + hv_ringbuffer_cleanup(&newchannel->inbound); free_pages((unsigned long)out, get_order(send_ringbuffer_size + recv_ringbuffer_size)); kfree(openInfo); @@ -651,8 +651,8 @@ void vmbus_close(struct vmbus_channel *channel) /* TODO: Send a msg to release the childRelId */ /* Cleanup the ring buffers for this channel */ - ringbuffer_cleanup(&channel->outbound); - ringbuffer_cleanup(&channel->inbound); + hv_ringbuffer_cleanup(&channel->outbound); + hv_ringbuffer_cleanup(&channel->inbound); free_pages((unsigned long)channel->ringbuffer_pages, get_order(channel->ringbuffer_pagecount * PAGE_SIZE)); diff --git a/drivers/staging/hv/ring_buffer.c b/drivers/staging/hv/ring_buffer.c index 9653ab5..9bab40c 100644 --- a/drivers/staging/hv/ring_buffer.c +++ b/drivers/staging/hv/ring_buffer.c @@ -328,13 +328,13 @@ int hv_ringbuffer_init(struct hv_ring_buffer_info *ring_info, /*++ Name: - ringbuffer_cleanup() + hv_ringbuffer_cleanup() Description: Cleanup the ring buffer --*/ -void ringbuffer_cleanup(struct hv_ring_buffer_info *ring_info) +void hv_ringbuffer_cleanup(struct hv_ring_buffer_info *ring_info) { } diff --git a/drivers/staging/hv/ring_buffer.h b/drivers/staging/hv/ring_buffer.h index 3c66dc0..66d9a2d 100644 --- a/drivers/staging/hv/ring_buffer.h +++ b/drivers/staging/hv/ring_buffer.h @@ -79,7 +79,7 @@ struct hv_ring_buffer_debug_info { int hv_ringbuffer_init(struct hv_ring_buffer_info *ring_info, void *buffer, u32 buflen); -void ringbuffer_cleanup(struct hv_ring_buffer_info *ring_info); +void hv_ringbuffer_cleanup(struct hv_ring_buffer_info *ring_info); int ringbuffer_write(struct hv_ring_buffer_info *ring_info, struct scatterlist *sglist, |