From: K. Y. Srinivasan Date: Tue, 10 May 2011 14:55:21 +0000 (-0700) Subject: Staging: hv: Rename the function ringbuffer_init X-Git-Tag: v3.0-rc1~336^2~339 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=72a95cbcbc24a464f3a51e610bd444fde2c73bbd;p=platform%2Fupstream%2Fkernel-adaptation-pc.git Staging: hv: Rename the function ringbuffer_init Rename the function ringbuffer_init to not pollute the namespace. Signed-off-by: K. Y. Srinivasan Signed-off-by: Haiyang Zhang Signed-off-by: Abhishek Kane Signed-off-by: Hank Janssen Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/hv/channel.c b/drivers/staging/hv/channel.c index b53be58..43e54b5 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 66e1b3f..9653ab5 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 7bf20d6..3c66dc0 100644 --- a/drivers/staging/hv/ring_buffer.h +++ b/drivers/staging/hv/ring_buffer.h @@ -18,6 +18,7 @@ * Authors: * Haiyang Zhang * Hank Janssen + * K. Y. Srinivasan * */ @@ -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);