Commit 72a95cbc authored by K. Y. Srinivasan's avatar K. Y. Srinivasan Committed by Greg Kroah-Hartman
Browse files

Staging: hv: Rename the function ringbuffer_init 



Rename the function ringbuffer_init to not pollute the
namespace.

Signed-off-by: default avatarK. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: default avatarHaiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: default avatarAbhishek Kane <v-abkane@microsoft.com>
Signed-off-by: default avatarHank Janssen <hjanssen@microsoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 1745ec50

drivers/staging/hv/channel.c

+5 −2
Original line number Diff line number Diff line
@@ -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;

drivers/staging/hv/ring_buffer.c

+2 −2
Original line number Diff line number Diff line
@@ -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)

drivers/staging/hv/ring_buffer.h

+2 −1
Original line number Diff line number Diff line
@@ -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);