evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Staging: hv: Rename ringbuffer_read

Browse source 
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>
This commit is contained in:
K. Y. Srinivasan 2011-05-10 07:55:25 -07:00 • committed by Greg Kroah-Hartman
parent a89186c21c
commit 38397c8abe
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/staging/hv/channel.c
View file

@ -911,7 +911,7 @@ int vmbus_recvpacket(struct vmbus_channel *channel, void *buffer,
*requestid = desc.trans_id; *requestid = desc.trans_id;
/* Copy over the packet to the user buffer */ /* Copy over the packet to the user buffer */
ret = ringbuffer_read(&channel->inbound, buffer, userlen, ret = hv_ringbuffer_read(&channel->inbound, buffer, userlen,
(desc.offset8 << 3)); (desc.offset8 << 3));
spin_unlock_irqrestore(&channel->inbound_lock, flags); spin_unlock_irqrestore(&channel->inbound_lock, flags);
@ -964,7 +964,7 @@ int vmbus_recvpacket_raw(struct vmbus_channel *channel, void *buffer,
*requestid = desc.trans_id; *requestid = desc.trans_id;
/* Copy over the entire packet to the user buffer */ /* Copy over the entire packet to the user buffer */
ret = ringbuffer_read(&channel->inbound, buffer, packetlen, 0); ret = hv_ringbuffer_read(&channel->inbound, buffer, packetlen, 0);
spin_unlock_irqrestore(&channel->inbound_lock, flags); spin_unlock_irqrestore(&channel->inbound_lock, flags);
return 0; return 0;

4
drivers/staging/hv/ring_buffer.c
View file

@ -468,13 +468,13 @@ int hv_ringbuffer_peek(struct hv_ring_buffer_info *Inring_info,
/*++ /*++
Name: Name:
ringbuffer_read() hv_ringbuffer_read()
Description: Description:
Read and advance the read index Read and advance the read index
--*/ --*/
int ringbuffer_read(struct hv_ring_buffer_info *inring_info, void *buffer, int hv_ringbuffer_read(struct hv_ring_buffer_info *inring_info, void *buffer,
u32 buflen, u32 offset) u32 buflen, u32 offset)
{ {
u32 bytes_avail_towrite; u32 bytes_avail_towrite;

2
drivers/staging/hv/ring_buffer.h
View file

@ -88,7 +88,7 @@ int hv_ringbuffer_write(struct hv_ring_buffer_info *ring_info,
int hv_ringbuffer_peek(struct hv_ring_buffer_info *ring_info, void *buffer, int hv_ringbuffer_peek(struct hv_ring_buffer_info *ring_info, void *buffer,
u32 buflen); u32 buflen);
int ringbuffer_read(struct hv_ring_buffer_info *ring_info, int hv_ringbuffer_read(struct hv_ring_buffer_info *ring_info,
void *buffer, void *buffer,
u32 buflen, u32 buflen,
u32 offset); u32 offset);