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>

diff --git a/drivers/staging/hv/channel.c b/drivers/staging/hv/channel.c
index b53be5847a3427e950b0765213938355a2869cc5..43e54b514d4468735cb0bd3e5f17a07b4f0a9828 100644 (file)
--- 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 66e1b3f16d9a646ad1f99bd52696f408185d031b..9653ab5022ddc239c7945e11f0e612afc5b8f313 100644 (file)
--- 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 7bf20d67187b36e0aab810c6cc562fb9544795cf..3c66dc040e05df6f894873c8c8b589ef222abed9 100644 (file)
--- 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);