Skip to content

Commit

Permalink
Staging: hv: Rename ringbuffer_cleanup
Browse files Browse the repository at this point in the history
Rename ringbuffer_cleanup.

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 72a95cb commit 2dba688
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
8 changes: 4 additions & 4 deletions drivers/staging/hv/channel.c
Original file line number Diff line number Diff line change
Expand Up @@ -292,8 +292,8 @@ int vmbus_open(struct vmbus_channel *newchannel, u32 send_ringbuffer_size,
return err;

errorout:
ringbuffer_cleanup(&newchannel->outbound);
ringbuffer_cleanup(&newchannel->inbound);
hv_ringbuffer_cleanup(&newchannel->outbound);
hv_ringbuffer_cleanup(&newchannel->inbound);
free_pages((unsigned long)out,
get_order(send_ringbuffer_size + recv_ringbuffer_size));
kfree(openInfo);
Expand Down Expand Up @@ -651,8 +651,8 @@ void vmbus_close(struct vmbus_channel *channel)
/* TODO: Send a msg to release the childRelId */

/* Cleanup the ring buffers for this channel */
ringbuffer_cleanup(&channel->outbound);
ringbuffer_cleanup(&channel->inbound);
hv_ringbuffer_cleanup(&channel->outbound);
hv_ringbuffer_cleanup(&channel->inbound);

free_pages((unsigned long)channel->ringbuffer_pages,
get_order(channel->ringbuffer_pagecount * PAGE_SIZE));
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 @@ -328,13 +328,13 @@ int hv_ringbuffer_init(struct hv_ring_buffer_info *ring_info,
/*++
Name:
ringbuffer_cleanup()
hv_ringbuffer_cleanup()
Description:
Cleanup the ring buffer
--*/
void ringbuffer_cleanup(struct hv_ring_buffer_info *ring_info)
void hv_ringbuffer_cleanup(struct hv_ring_buffer_info *ring_info)
{
}

Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/hv/ring_buffer.h
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ struct hv_ring_buffer_debug_info {
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);
void hv_ringbuffer_cleanup(struct hv_ring_buffer_info *ring_info);

int ringbuffer_write(struct hv_ring_buffer_info *ring_info,
struct scatterlist *sglist,
Expand Down

0 comments on commit 2dba688

Please sign in to comment.