Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / staging / hv / ring_buffer.h

diff --git a/drivers/staging/hv/ring_buffer.h b/drivers/staging/hv/ring_buffer.h
index a7f1717c6a5659b49b9a7c2aa56bbbea97e1e30a..7bd6ecf2f015738e1eeef5bbf097d5a9a62af08a 100644 (file)
--- a/drivers/staging/hv/ring_buffer.h
+++ b/drivers/staging/hv/ring_buffer.h
@@ -29,18 +29,18 @@
 
 struct hv_ring_buffer {
        /* Offset in bytes from the start of ring data below */
-       volatile u32 WriteIndex;
+       volatile u32 write_index;
 
        /* Offset in bytes from the start of ring data below */
-       volatile u32 ReadIndex;
+       volatile u32 read_index;
 
-       volatile u32 InterruptMask;
+       volatile u32 interrupt_mask;
 
        /* Pad it to PAGE_SIZE so that data starts on page boundary */
-       u8      Reserved[4084];
+       u8      reserved[4084];
 
        /* NOTE:
-        * The InterruptMask field is used only for channels but since our
+        * The interrupt_mask field is used only for channels but since our
         * vmbus connection also uses this data structure and its data starts
         * here, we commented out this field.
         */
@@ -50,24 +50,24 @@ struct hv_ring_buffer {
         * Ring data starts here + RingDataStartOffset
         * !!! DO NOT place any fields below this !!!
         */
-       u8 Buffer[0];
+       u8 buffer[0];
 } __attribute__((packed));
 
 struct hv_ring_buffer_info {
-       struct hv_ring_buffer *RingBuffer;
-       u32 RingSize;                   /* Include the shared header */
+       struct hv_ring_buffer *ring_buffer;
+       u32 ring_size;                  /* Include the shared header */
        spinlock_t ring_lock;
 
-       u32 RingDataSize;               /* < ringSize */
-       u32 RingDataStartOffset;
+       u32 ring_datasize;              /* < ring_size */
+       u32 ring_data_startoffset;
 };
 
 struct hv_ring_buffer_debug_info {
-       u32 CurrentInterruptMask;
-       u32 CurrentReadIndex;
-       u32 CurrentWriteIndex;
-       u32 BytesAvailToRead;
-       u32 BytesAvailToWrite;
+       u32 current_interrupt_mask;
+       u32 current_read_index;
+       u32 current_write_index;
+       u32 bytes_avail_toread;
+       u32 bytes_avail_towrite;
 };
 
 
@@ -75,28 +75,28 @@ struct hv_ring_buffer_debug_info {
 /* Interface */
 
 
-int RingBufferInit(struct hv_ring_buffer_info *RingInfo, void *Buffer,
-                  u32 BufferLen);
+int ringbuffer_init(struct hv_ring_buffer_info *ring_info, void *buffer,
+                  u32 buflen);
 
-void RingBufferCleanup(struct hv_ring_buffer_info *RingInfo);
+void ringbuffer_cleanup(struct hv_ring_buffer_info *ring_info);
 
-int RingBufferWrite(struct hv_ring_buffer_info *RingInfo,
+int ringbuffer_write(struct hv_ring_buffer_info *ring_info,
                    struct scatterlist *sglist,
                    u32 sgcount);
 
-int RingBufferPeek(struct hv_ring_buffer_info *RingInfo, void *Buffer,
-                  u32 BufferLen);
+int ringbuffer_peek(struct hv_ring_buffer_info *ring_info, void *buffer,
+                  u32 buflen);
 
-int RingBufferRead(struct hv_ring_buffer_info *RingInfo,
-                  void *Buffer,
-                  u32 BufferLen,
-                  u32 Offset);
+int ringbuffer_read(struct hv_ring_buffer_info *ring_info,
+                  void *buffer,
+                  u32 buflen,
+                  u32 offset);
 
-u32 GetRingBufferInterruptMask(struct hv_ring_buffer_info *RingInfo);
+u32 get_ringbuffer_interrupt_mask(struct hv_ring_buffer_info *ring_info);
 
-void DumpRingInfo(struct hv_ring_buffer_info *RingInfo, char *Prefix);
+void dump_ring_info(struct hv_ring_buffer_info *ring_info, char *prefix);
 
-void RingBufferGetDebugInfo(struct hv_ring_buffer_info *RingInfo,
+void ringbuffer_get_debuginfo(struct hv_ring_buffer_info *ring_info,
                            struct hv_ring_buffer_debug_info *debug_info);
 
 #endif /* _RING_BUFFER_H_ */