From: K. Y. Srinivasan Date: Tue, 10 May 2011 14:55:23 +0000 (-0700) Subject: Staging: hv: Rename ringbuffer_write X-Git-Tag: firefly_0821_release~7613^2~1326^2~337 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=633c4dce4e822be6155a78cec488e8bde521e908;p=firefly-linux-kernel-4.4.55.git Staging: hv: Rename ringbuffer_write Rename ringbuffer_write. Signed-off-by: K. Y. Srinivasan Signed-off-by: Haiyang Zhang Signed-off-by: Abhishek Kane Signed-off-by: Hank Janssen Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/hv/channel.c b/drivers/staging/hv/channel.c index 44b81e897aa2..859771c01611 100644 --- a/drivers/staging/hv/channel.c +++ b/drivers/staging/hv/channel.c @@ -718,7 +718,7 @@ int vmbus_sendpacket(struct vmbus_channel *channel, const void *buffer, sg_set_buf(&bufferlist[2], &aligned_data, packetlen_aligned - packetlen); - ret = ringbuffer_write(&channel->outbound, bufferlist, 3); + ret = hv_ringbuffer_write(&channel->outbound, bufferlist, 3); /* TODO: We should determine if this is optional */ if (ret == 0 && !get_ringbuffer_interrupt_mask(&channel->outbound)) @@ -783,7 +783,7 @@ int vmbus_sendpacket_pagebuffer(struct vmbus_channel *channel, sg_set_buf(&bufferlist[2], &aligned_data, packetlen_aligned - packetlen); - ret = ringbuffer_write(&channel->outbound, bufferlist, 3); + ret = hv_ringbuffer_write(&channel->outbound, bufferlist, 3); /* TODO: We should determine if this is optional */ if (ret == 0 && !get_ringbuffer_interrupt_mask(&channel->outbound)) @@ -848,7 +848,7 @@ int vmbus_sendpacket_multipagebuffer(struct vmbus_channel *channel, sg_set_buf(&bufferlist[2], &aligned_data, packetlen_aligned - packetlen); - ret = ringbuffer_write(&channel->outbound, bufferlist, 3); + ret = hv_ringbuffer_write(&channel->outbound, bufferlist, 3); /* TODO: We should determine if this is optional */ if (ret == 0 && !get_ringbuffer_interrupt_mask(&channel->outbound)) diff --git a/drivers/staging/hv/ring_buffer.c b/drivers/staging/hv/ring_buffer.c index 9bab40c1682d..483678c83eba 100644 --- a/drivers/staging/hv/ring_buffer.c +++ b/drivers/staging/hv/ring_buffer.c @@ -341,13 +341,13 @@ void hv_ringbuffer_cleanup(struct hv_ring_buffer_info *ring_info) /*++ Name: - ringbuffer_write() + hv_ringbuffer_write() Description: Write to the ring buffer --*/ -int ringbuffer_write(struct hv_ring_buffer_info *outring_info, +int hv_ringbuffer_write(struct hv_ring_buffer_info *outring_info, struct scatterlist *sglist, u32 sgcount) { int i = 0; diff --git a/drivers/staging/hv/ring_buffer.h b/drivers/staging/hv/ring_buffer.h index 66d9a2d5f9c1..5c172889d116 100644 --- a/drivers/staging/hv/ring_buffer.h +++ b/drivers/staging/hv/ring_buffer.h @@ -81,7 +81,7 @@ int hv_ringbuffer_init(struct hv_ring_buffer_info *ring_info, void *buffer, void hv_ringbuffer_cleanup(struct hv_ring_buffer_info *ring_info); -int ringbuffer_write(struct hv_ring_buffer_info *ring_info, +int hv_ringbuffer_write(struct hv_ring_buffer_info *ring_info, struct scatterlist *sglist, u32 sgcount);