From 80682b7a4821b9e4f05bcc2ec855aaafcef33234 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 27 Jul 2010 11:37:32 -0700 Subject: [PATCH 464/524] Staging: hv: remove RING_BUFFER_DEBUG_INFO typedef typedefs are bad, kill them. Cc: Hank Janssen Cc: Haiyang Zhang Signed-off-by: Greg Kroah-Hartman --- drivers/staging/hv/channel_mgmt.h | 4 ++-- drivers/staging/hv/ring_buffer.c | 12 ++++++------ drivers/staging/hv/ring_buffer.h | 6 +++--- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/drivers/staging/hv/channel_mgmt.h b/drivers/staging/hv/channel_mgmt.h index 5908b81..cf7f1d2 100644 --- 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 66a4974..ac8cb69 100644 --- 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 6202157..64a6989 100644 --- 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_ */ -- 1.7.1