Commit 1ac58644 authored by Haiyang Zhang's avatar Haiyang Zhang Committed by Greg Kroah-Hartman

staging: hv: Convert camel cased functions in ring_buffer.c to lower cases

staging: hv: Convert camel cased functions in ring_buffer.c to lower cases
Signed-off-by: default avatarHaiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: default avatarHank Janssen <hjanssen@microsoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent fc8c72eb
...@@ -155,8 +155,8 @@ void vmbus_get_debug_info(struct vmbus_channel *channel, ...@@ -155,8 +155,8 @@ void vmbus_get_debug_info(struct vmbus_channel *channel,
monitorpage->parameter[monitor_group] monitorpage->parameter[monitor_group]
[monitor_offset].connectionid.u.id; [monitor_offset].connectionid.u.id;
RingBufferGetDebugInfo(&channel->inbound, &debuginfo->inbound); ringbuffer_get_debuginfo(&channel->inbound, &debuginfo->inbound);
RingBufferGetDebugInfo(&channel->outbound, &debuginfo->outbound); ringbuffer_get_debuginfo(&channel->outbound, &debuginfo->outbound);
} }
/* /*
...@@ -193,13 +193,13 @@ int vmbus_open(struct vmbus_channel *newchannel, u32 send_ringbuffer_size, ...@@ -193,13 +193,13 @@ int vmbus_open(struct vmbus_channel *newchannel, u32 send_ringbuffer_size,
newchannel->ringbuffer_pagecount = (send_ringbuffer_size + newchannel->ringbuffer_pagecount = (send_ringbuffer_size +
recv_ringbuffer_size) >> PAGE_SHIFT; recv_ringbuffer_size) >> PAGE_SHIFT;
ret = RingBufferInit(&newchannel->outbound, out, send_ringbuffer_size); ret = ringbuffer_init(&newchannel->outbound, out, send_ringbuffer_size);
if (ret != 0) { if (ret != 0) {
err = ret; err = ret;
goto errorout; goto errorout;
} }
ret = RingBufferInit(&newchannel->inbound, in, recv_ringbuffer_size); ret = ringbuffer_init(&newchannel->inbound, in, recv_ringbuffer_size);
if (ret != 0) { if (ret != 0) {
err = ret; err = ret;
goto errorout; goto errorout;
...@@ -298,8 +298,8 @@ int vmbus_open(struct vmbus_channel *newchannel, u32 send_ringbuffer_size, ...@@ -298,8 +298,8 @@ int vmbus_open(struct vmbus_channel *newchannel, u32 send_ringbuffer_size,
return 0; return 0;
errorout: errorout:
RingBufferCleanup(&newchannel->outbound); ringbuffer_cleanup(&newchannel->outbound);
RingBufferCleanup(&newchannel->inbound); ringbuffer_cleanup(&newchannel->inbound);
osd_page_free(out, (send_ringbuffer_size + recv_ringbuffer_size) osd_page_free(out, (send_ringbuffer_size + recv_ringbuffer_size)
>> PAGE_SHIFT); >> PAGE_SHIFT);
kfree(openInfo); kfree(openInfo);
...@@ -683,8 +683,8 @@ void vmbus_close(struct vmbus_channel *channel) ...@@ -683,8 +683,8 @@ void vmbus_close(struct vmbus_channel *channel)
/* TODO: Send a msg to release the childRelId */ /* TODO: Send a msg to release the childRelId */
/* Cleanup the ring buffers for this channel */ /* Cleanup the ring buffers for this channel */
RingBufferCleanup(&channel->outbound); ringbuffer_cleanup(&channel->outbound);
RingBufferCleanup(&channel->inbound); ringbuffer_cleanup(&channel->inbound);
osd_page_free(channel->ringbuffer_pages, channel->ringbuffer_pagecount); osd_page_free(channel->ringbuffer_pages, channel->ringbuffer_pagecount);
...@@ -752,10 +752,10 @@ int vmbus_sendpacket(struct vmbus_channel *channel, const void *buffer, ...@@ -752,10 +752,10 @@ int vmbus_sendpacket(struct vmbus_channel *channel, const void *buffer,
sg_set_buf(&bufferlist[2], &aligned_data, sg_set_buf(&bufferlist[2], &aligned_data,
packetlen_aligned - packetlen); packetlen_aligned - packetlen);
ret = RingBufferWrite(&channel->outbound, bufferlist, 3); ret = ringbuffer_write(&channel->outbound, bufferlist, 3);
/* TODO: We should determine if this is optional */ /* TODO: We should determine if this is optional */
if (ret == 0 && !GetRingBufferInterruptMask(&channel->outbound)) if (ret == 0 && !get_ringbuffer_interrupt_mask(&channel->outbound))
vmbus_setevent(channel); vmbus_setevent(channel);
return ret; return ret;
...@@ -817,10 +817,10 @@ int vmbus_sendpacket_pagebuffer(struct vmbus_channel *channel, ...@@ -817,10 +817,10 @@ int vmbus_sendpacket_pagebuffer(struct vmbus_channel *channel,
sg_set_buf(&bufferlist[2], &aligned_data, sg_set_buf(&bufferlist[2], &aligned_data,
packetlen_aligned - packetlen); packetlen_aligned - packetlen);
ret = RingBufferWrite(&channel->outbound, bufferlist, 3); ret = ringbuffer_write(&channel->outbound, bufferlist, 3);
/* TODO: We should determine if this is optional */ /* TODO: We should determine if this is optional */
if (ret == 0 && !GetRingBufferInterruptMask(&channel->outbound)) if (ret == 0 && !get_ringbuffer_interrupt_mask(&channel->outbound))
vmbus_setevent(channel); vmbus_setevent(channel);
return ret; return ret;
...@@ -886,10 +886,10 @@ int vmbus_sendpacket_multipagebuffer(struct vmbus_channel *channel, ...@@ -886,10 +886,10 @@ int vmbus_sendpacket_multipagebuffer(struct vmbus_channel *channel,
sg_set_buf(&bufferlist[2], &aligned_data, sg_set_buf(&bufferlist[2], &aligned_data,
packetlen_aligned - packetlen); packetlen_aligned - packetlen);
ret = RingBufferWrite(&channel->outbound, bufferlist, 3); ret = ringbuffer_write(&channel->outbound, bufferlist, 3);
/* TODO: We should determine if this is optional */ /* TODO: We should determine if this is optional */
if (ret == 0 && !GetRingBufferInterruptMask(&channel->outbound)) if (ret == 0 && !get_ringbuffer_interrupt_mask(&channel->outbound))
vmbus_setevent(channel); vmbus_setevent(channel);
return ret; return ret;
...@@ -923,7 +923,7 @@ int vmbus_recvpacket(struct vmbus_channel *channel, void *buffer, ...@@ -923,7 +923,7 @@ int vmbus_recvpacket(struct vmbus_channel *channel, void *buffer,
spin_lock_irqsave(&channel->inbound_lock, flags); spin_lock_irqsave(&channel->inbound_lock, flags);
ret = RingBufferPeek(&channel->inbound, &desc, ret = ringbuffer_peek(&channel->inbound, &desc,
sizeof(struct vmpacket_descriptor)); sizeof(struct vmpacket_descriptor));
if (ret != 0) { if (ret != 0) {
spin_unlock_irqrestore(&channel->inbound_lock, flags); spin_unlock_irqrestore(&channel->inbound_lock, flags);
...@@ -956,7 +956,7 @@ int vmbus_recvpacket(struct vmbus_channel *channel, void *buffer, ...@@ -956,7 +956,7 @@ int vmbus_recvpacket(struct vmbus_channel *channel, void *buffer,
*requestid = desc.TransactionId; *requestid = desc.TransactionId;
/* Copy over the packet to the user buffer */ /* Copy over the packet to the user buffer */
ret = RingBufferRead(&channel->inbound, buffer, userlen, ret = ringbuffer_read(&channel->inbound, buffer, userlen,
(desc.DataOffset8 << 3)); (desc.DataOffset8 << 3));
spin_unlock_irqrestore(&channel->inbound_lock, flags); spin_unlock_irqrestore(&channel->inbound_lock, flags);
...@@ -983,7 +983,7 @@ int vmbus_recvpacket_raw(struct vmbus_channel *channel, void *buffer, ...@@ -983,7 +983,7 @@ int vmbus_recvpacket_raw(struct vmbus_channel *channel, void *buffer,
spin_lock_irqsave(&channel->inbound_lock, flags); spin_lock_irqsave(&channel->inbound_lock, flags);
ret = RingBufferPeek(&channel->inbound, &desc, ret = ringbuffer_peek(&channel->inbound, &desc,
sizeof(struct vmpacket_descriptor)); sizeof(struct vmpacket_descriptor));
if (ret != 0) { if (ret != 0) {
spin_unlock_irqrestore(&channel->inbound_lock, flags); spin_unlock_irqrestore(&channel->inbound_lock, flags);
...@@ -1015,7 +1015,7 @@ int vmbus_recvpacket_raw(struct vmbus_channel *channel, void *buffer, ...@@ -1015,7 +1015,7 @@ int vmbus_recvpacket_raw(struct vmbus_channel *channel, void *buffer,
*requestid = desc.TransactionId; *requestid = desc.TransactionId;
/* Copy over the entire packet to the user buffer */ /* Copy over the entire packet to the user buffer */
ret = RingBufferRead(&channel->inbound, buffer, packetlen, 0); ret = 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;
...@@ -1052,6 +1052,6 @@ void vmbus_ontimer(unsigned long data) ...@@ -1052,6 +1052,6 @@ void vmbus_ontimer(unsigned long data)
static void dump_vmbus_channel(struct vmbus_channel *channel) static void dump_vmbus_channel(struct vmbus_channel *channel)
{ {
DPRINT_DBG(VMBUS, "Channel (%d)", channel->offermsg.child_relid); DPRINT_DBG(VMBUS, "Channel (%d)", channel->offermsg.child_relid);
Dumpring_info(&channel->outbound, "Outbound "); dump_ring_info(&channel->outbound, "Outbound ");
Dumpring_info(&channel->inbound, "Inbound "); dump_ring_info(&channel->inbound, "Inbound ");
} }
This diff is collapsed.
...@@ -75,28 +75,28 @@ struct hv_ring_buffer_debug_info { ...@@ -75,28 +75,28 @@ struct hv_ring_buffer_debug_info {
/* Interface */ /* Interface */
int RingBufferInit(struct hv_ring_buffer_info *ring_info, void *buffer, int ringbuffer_init(struct hv_ring_buffer_info *ring_info, void *buffer,
u32 buflen); u32 buflen);
void RingBufferCleanup(struct hv_ring_buffer_info *ring_info); void ringbuffer_cleanup(struct hv_ring_buffer_info *ring_info);
int RingBufferWrite(struct hv_ring_buffer_info *ring_info, int ringbuffer_write(struct hv_ring_buffer_info *ring_info,
struct scatterlist *sglist, struct scatterlist *sglist,
u32 sgcount); u32 sgcount);
int RingBufferPeek(struct hv_ring_buffer_info *ring_info, void *buffer, int ringbuffer_peek(struct hv_ring_buffer_info *ring_info, void *buffer,
u32 buflen); u32 buflen);
int RingBufferRead(struct hv_ring_buffer_info *ring_info, int ringbuffer_read(struct hv_ring_buffer_info *ring_info,
void *buffer, void *buffer,
u32 buflen, u32 buflen,
u32 offset); u32 offset);
u32 GetRingBufferInterruptMask(struct hv_ring_buffer_info *ring_info); u32 get_ringbuffer_interrupt_mask(struct hv_ring_buffer_info *ring_info);
void Dumpring_info(struct hv_ring_buffer_info *ring_info, char *prefix); void dump_ring_info(struct hv_ring_buffer_info *ring_info, char *prefix);
void RingBufferGetDebugInfo(struct hv_ring_buffer_info *ring_info, void ringbuffer_get_debuginfo(struct hv_ring_buffer_info *ring_info,
struct hv_ring_buffer_debug_info *debug_info); struct hv_ring_buffer_debug_info *debug_info);
#endif /* _RING_BUFFER_H_ */ #endif /* _RING_BUFFER_H_ */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment