Skip to content

Commit

Permalink
Staging: hv: Rename the function ringbuffer_init
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
K. Y. Srinivasan authored and Greg Kroah-Hartman committed May 11, 2011
1 parent 1745ec5 commit 72a95cb
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 5 deletions.
7 changes: 5 additions & 2 deletions drivers/staging/hv/channel.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions drivers/staging/hv/ring_buffer.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
3 changes: 2 additions & 1 deletion drivers/staging/hv/ring_buffer.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
* Authors:
* Haiyang Zhang <haiyangz@microsoft.com>
* Hank Janssen <hjanssen@microsoft.com>
* K. Y. Srinivasan <kys@microsoft.com>
*
*/

Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit 72a95cb

Please sign in to comment.