diff options
| author | K. Y. Srinivasan <kys@microsoft.com> | 2011-05-10 07:55:21 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-05-11 13:49:00 -0700 |
| commit | 72a95cbcbc24a464f3a51e610bd444fde2c73bbd (patch) | |
| tree | 2726fcad7fd057d66ed5c8051576a4a0d94ec78b /drivers | |
| parent | 1745ec504a80c620a7c9b9df5a03de56cfbd85d5 (diff) | |
| download | linux-stable-72a95cbcbc24a464f3a51e610bd444fde2c73bbd.tar.gz linux-stable-72a95cbcbc24a464f3a51e610bd444fde2c73bbd.tar.bz2 linux-stable-72a95cbcbc24a464f3a51e610bd444fde2c73bbd.zip | |
Staging: hv: Rename the function ringbuffer_init
Rename the function ringbuffer_init to not pollute the
namespace.
Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Abhishek Kane <v-abkane@microsoft.com>
Signed-off-by: Hank Janssen <hjanssen@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/staging/hv/channel.c | 7 | ||||
| -rw-r--r-- | drivers/staging/hv/ring_buffer.c | 4 | ||||
| -rw-r--r-- | drivers/staging/hv/ring_buffer.h | 3 |
3 files changed, 9 insertions, 5 deletions
diff --git a/drivers/staging/hv/channel.c b/drivers/staging/hv/channel.c index b53be5847a34..43e54b514d44 100644 --- a/drivers/staging/hv/channel.c +++ b/drivers/staging/hv/channel.c @@ -201,13 +201,16 @@ int vmbus_open(struct vmbus_channel *newchannel, u32 send_ringbuffer_size, newchannel->ringbuffer_pagecount = (send_ringbuffer_size + recv_ringbuffer_size) >> PAGE_SHIFT; - ret = ringbuffer_init(&newchannel->outbound, out, send_ringbuffer_size); + ret = hv_ringbuffer_init( + &newchannel->outbound, out, send_ringbuffer_size); + if (ret != 0) { err = ret; goto errorout; } - ret = ringbuffer_init(&newchannel->inbound, in, recv_ringbuffer_size); + ret = hv_ringbuffer_init( + &newchannel->inbound, in, recv_ringbuffer_size); if (ret != 0) { err = ret; goto errorout; diff --git a/drivers/staging/hv/ring_buffer.c b/drivers/staging/hv/ring_buffer.c index 66e1b3f16d9a..9653ab5022dd 100644 --- a/drivers/staging/hv/ring_buffer.c +++ b/drivers/staging/hv/ring_buffer.c @@ -299,13 +299,13 @@ u32 get_ringbuffer_interrupt_mask(struct hv_ring_buffer_info *rbi) /*++ Name: - ringbuffer_init() + hv_ringbuffer_init() Description: Initialize the ring buffer --*/ -int ringbuffer_init(struct hv_ring_buffer_info *ring_info, +int hv_ringbuffer_init(struct hv_ring_buffer_info *ring_info, void *buffer, u32 buflen) { if (sizeof(struct hv_ring_buffer) != PAGE_SIZE) diff --git a/drivers/staging/hv/ring_buffer.h b/drivers/staging/hv/ring_buffer.h index 7bf20d67187b..3c66dc040e05 100644 --- a/drivers/staging/hv/ring_buffer.h +++ b/drivers/staging/hv/ring_buffer.h @@ -18,6 +18,7 @@ * Authors: * Haiyang Zhang <haiyangz@microsoft.com> * Hank Janssen <hjanssen@microsoft.com> + * K. Y. Srinivasan <kys@microsoft.com> * */ @@ -75,7 +76,7 @@ struct hv_ring_buffer_debug_info { /* Interface */ -int ringbuffer_init(struct hv_ring_buffer_info *ring_info, void *buffer, +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); |