Commit 8f1136ae authored by K. Y. Srinivasan's avatar K. Y. Srinivasan Committed by Greg Kroah-Hartman
Browse files

Staging: hv: Get rid of the forward declaration of hv_copyfrom_ringbuffer 



Get rid of the forward declaration by moving code around.

Signed-off-by: default avatarK. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: default avatarHaiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: default avatarAbhishek Kane <v-abkane@microsoft.com>
Signed-off-by: default avatarHank Janssen <hjanssen@microsoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent b2a5a585

drivers/staging/hv/ring_buffer.c

+37 −46
Original line number Diff line number Diff line
@@ -199,6 +199,43 @@ void hv_dump_ring_info(struct hv_ring_buffer_info *ring_info, char *prefix) 
}





/*

 *

 * hv_copyfrom_ringbuffer()

 *

 * Helper routine to copy to source from ring buffer.

 * Assume there is enough room. Handles wrap-around in src case only!!

 *

 */

static u32 hv_copyfrom_ringbuffer(

	struct hv_ring_buffer_info	*ring_info,

	void				*dest,

	u32				destlen,

	u32				start_read_offset)

{

	void *ring_buffer = hv_get_ring_buffer(ring_info);

	u32 ring_buffer_size = hv_get_ring_buffersize(ring_info);



	u32 frag_len;



	/* wrap-around detected at the src */

	if (destlen > ring_buffer_size - start_read_offset) {

		frag_len = ring_buffer_size - start_read_offset;



		memcpy(dest, ring_buffer + start_read_offset, frag_len);

		memcpy(dest + frag_len, ring_buffer, destlen - frag_len);

	} else



		memcpy(dest, ring_buffer + start_read_offset, destlen);





	start_read_offset += destlen;

	start_read_offset %= ring_buffer_size;



	return start_read_offset;

}







static u32

hv_copyto_ringbuffer(
@@ -207,14 +244,6 @@ hv_copyto_ringbuffer( 
	void				*src,

	u32				srclen);



static u32

hv_copyfrom_ringbuffer(

	struct hv_ring_buffer_info	*ring_info,

	void				*dest,

	u32				destlen,

	u32				start_read_offset);







/*

 *
@@ -504,41 +533,3 @@ hv_copyto_ringbuffer( 
	return start_write_offset;

}



/*

 *

 * hv_copyfrom_ringbuffer()

 *

 * Helper routine to copy to source from ring buffer.

 * Assume there is enough room. Handles wrap-around in src case only!!

 *

 */

static u32

hv_copyfrom_ringbuffer(

	struct hv_ring_buffer_info	*ring_info,

	void				*dest,

	u32				destlen,

	u32				start_read_offset)

{

	void *ring_buffer = hv_get_ring_buffer(ring_info);

	u32 ring_buffer_size = hv_get_ring_buffersize(ring_info);



	u32 frag_len;



	/* wrap-around detected at the src */

	if (destlen > ring_buffer_size - start_read_offset) {

		frag_len = ring_buffer_size - start_read_offset;



		memcpy(dest, ring_buffer + start_read_offset, frag_len);

		memcpy(dest + frag_len, ring_buffer, destlen - frag_len);

	} else



		memcpy(dest, ring_buffer + start_read_offset, destlen);





	start_read_offset += destlen;

	start_read_offset %= ring_buffer_size;



	return start_read_offset;

}