Staging: hv: remove RING_BUFFER_DEBUG_INFO typedef

typedefs are bad, kill them.

Cc: Hank Janssen <hjanssen@microsoft.com>
Cc: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/hv/channel_mgmt.h b/drivers/staging/hv/channel_mgmt.h
index 5908b81d3e9c044ac1d35583e8355016a00f8516..cf7f1d205c1301b37c6d398e127672d719f7a50b 100644 (file)
--- a/drivers/staging/hv/channel_mgmt.h
+++ b/drivers/staging/hv/channel_mgmt.h
@@ -272,8 +272,8 @@ struct vmbus_channel_debug_info {
        u32 ClientMonitorLatency;
        u32 ClientMonitorConnectionId;
 
-       RING_BUFFER_DEBUG_INFO Inbound;
-       RING_BUFFER_DEBUG_INFO Outbound;
+       struct hv_ring_buffer_debug_info Inbound;
+       struct hv_ring_buffer_debug_info Outbound;
 };
 
 /*

diff --git a/drivers/staging/hv/ring_buffer.c b/drivers/staging/hv/ring_buffer.c
index 66a497495d15c02fd3259b92504e24a9fb88329f..ac8cb69147c4c00c94357161a6dd988d0d117e98 100644 (file)
--- a/drivers/staging/hv/ring_buffer.c
+++ b/drivers/staging/hv/ring_buffer.c
@@ -257,7 +257,7 @@ Description:
 
 --*/
 void RingBufferGetDebugInfo(RING_BUFFER_INFO *RingInfo,
-                           RING_BUFFER_DEBUG_INFO *DebugInfo)
+                           struct hv_ring_buffer_debug_info *debug_info)
 {
        u32 bytesAvailToWrite;
        u32 bytesAvailToRead;
@@ -267,11 +267,11 @@ void RingBufferGetDebugInfo(RING_BUFFER_INFO *RingInfo,
                                        &bytesAvailToRead,
                                        &bytesAvailToWrite);
 
-               DebugInfo->BytesAvailToRead = bytesAvailToRead;
-               DebugInfo->BytesAvailToWrite = bytesAvailToWrite;
-               DebugInfo->CurrentReadIndex = RingInfo->RingBuffer->ReadIndex;
-               DebugInfo->CurrentWriteIndex = RingInfo->RingBuffer->WriteIndex;
-               DebugInfo->CurrentInterruptMask = RingInfo->RingBuffer->InterruptMask;
+               debug_info->BytesAvailToRead = bytesAvailToRead;
+               debug_info->BytesAvailToWrite = bytesAvailToWrite;
+               debug_info->CurrentReadIndex = RingInfo->RingBuffer->ReadIndex;
+               debug_info->CurrentWriteIndex = RingInfo->RingBuffer->WriteIndex;
+               debug_info->CurrentInterruptMask = RingInfo->RingBuffer->InterruptMask;
        }
 }
 

diff --git a/drivers/staging/hv/ring_buffer.h b/drivers/staging/hv/ring_buffer.h
index 6202157e145dc791b1412149c0dc94eb0066a2e8..64a6989ec0a5ae2186e7b1bdcd2b978ce7d74b82 100644 (file)
--- a/drivers/staging/hv/ring_buffer.h
+++ b/drivers/staging/hv/ring_buffer.h
@@ -63,13 +63,13 @@ typedef struct _RING_BUFFER_INFO {
 
 } RING_BUFFER_INFO;
 
-typedef struct _RING_BUFFER_DEBUG_INFO {
+struct hv_ring_buffer_debug_info {
        u32 CurrentInterruptMask;
        u32 CurrentReadIndex;
        u32 CurrentWriteIndex;
        u32 BytesAvailToRead;
        u32 BytesAvailToWrite;
-} RING_BUFFER_DEBUG_INFO;
+};
 
 
 
@@ -96,6 +96,6 @@ u32 GetRingBufferInterruptMask(RING_BUFFER_INFO *RingInfo);
 void DumpRingInfo(RING_BUFFER_INFO *RingInfo, char *Prefix);
 
 void RingBufferGetDebugInfo(RING_BUFFER_INFO *RingInfo,
-                           RING_BUFFER_DEBUG_INFO *DebugInfo);
+                           struct hv_ring_buffer_debug_info *debug_info);
 
 #endif /* _RING_BUFFER_H_ */