diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-07-27 14:37:32 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-07-27 14:37:32 -0400 |
commit | 80682b7a4821b9e4f05bcc2ec855aaafcef33234 (patch) | |
tree | 4d43a6636a41e8e9ad2479f8fa5896a88b312795 | |
parent | 3924865f7def7c1b46c0e47f058eb8173c72a16d (diff) |
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>
-rw-r--r-- | drivers/staging/hv/channel_mgmt.h | 4 | ||||
-rw-r--r-- | drivers/staging/hv/ring_buffer.c | 12 | ||||
-rw-r--r-- | 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 5908b81d3e9c..cf7f1d205c13 100644 --- a/drivers/staging/hv/channel_mgmt.h +++ b/drivers/staging/hv/channel_mgmt.h | |||
@@ -272,8 +272,8 @@ struct vmbus_channel_debug_info { | |||
272 | u32 ClientMonitorLatency; | 272 | u32 ClientMonitorLatency; |
273 | u32 ClientMonitorConnectionId; | 273 | u32 ClientMonitorConnectionId; |
274 | 274 | ||
275 | RING_BUFFER_DEBUG_INFO Inbound; | 275 | struct hv_ring_buffer_debug_info Inbound; |
276 | RING_BUFFER_DEBUG_INFO Outbound; | 276 | struct hv_ring_buffer_debug_info Outbound; |
277 | }; | 277 | }; |
278 | 278 | ||
279 | /* | 279 | /* |
diff --git a/drivers/staging/hv/ring_buffer.c b/drivers/staging/hv/ring_buffer.c index 66a497495d15..ac8cb69147c4 100644 --- a/drivers/staging/hv/ring_buffer.c +++ b/drivers/staging/hv/ring_buffer.c | |||
@@ -257,7 +257,7 @@ Description: | |||
257 | 257 | ||
258 | --*/ | 258 | --*/ |
259 | void RingBufferGetDebugInfo(RING_BUFFER_INFO *RingInfo, | 259 | void RingBufferGetDebugInfo(RING_BUFFER_INFO *RingInfo, |
260 | RING_BUFFER_DEBUG_INFO *DebugInfo) | 260 | struct hv_ring_buffer_debug_info *debug_info) |
261 | { | 261 | { |
262 | u32 bytesAvailToWrite; | 262 | u32 bytesAvailToWrite; |
263 | u32 bytesAvailToRead; | 263 | u32 bytesAvailToRead; |
@@ -267,11 +267,11 @@ void RingBufferGetDebugInfo(RING_BUFFER_INFO *RingInfo, | |||
267 | &bytesAvailToRead, | 267 | &bytesAvailToRead, |
268 | &bytesAvailToWrite); | 268 | &bytesAvailToWrite); |
269 | 269 | ||
270 | DebugInfo->BytesAvailToRead = bytesAvailToRead; | 270 | debug_info->BytesAvailToRead = bytesAvailToRead; |
271 | DebugInfo->BytesAvailToWrite = bytesAvailToWrite; | 271 | debug_info->BytesAvailToWrite = bytesAvailToWrite; |
272 | DebugInfo->CurrentReadIndex = RingInfo->RingBuffer->ReadIndex; | 272 | debug_info->CurrentReadIndex = RingInfo->RingBuffer->ReadIndex; |
273 | DebugInfo->CurrentWriteIndex = RingInfo->RingBuffer->WriteIndex; | 273 | debug_info->CurrentWriteIndex = RingInfo->RingBuffer->WriteIndex; |
274 | DebugInfo->CurrentInterruptMask = RingInfo->RingBuffer->InterruptMask; | 274 | debug_info->CurrentInterruptMask = RingInfo->RingBuffer->InterruptMask; |
275 | } | 275 | } |
276 | } | 276 | } |
277 | 277 | ||
diff --git a/drivers/staging/hv/ring_buffer.h b/drivers/staging/hv/ring_buffer.h index 6202157e145d..64a6989ec0a5 100644 --- a/drivers/staging/hv/ring_buffer.h +++ b/drivers/staging/hv/ring_buffer.h | |||
@@ -63,13 +63,13 @@ typedef struct _RING_BUFFER_INFO { | |||
63 | 63 | ||
64 | } RING_BUFFER_INFO; | 64 | } RING_BUFFER_INFO; |
65 | 65 | ||
66 | typedef struct _RING_BUFFER_DEBUG_INFO { | 66 | struct hv_ring_buffer_debug_info { |
67 | u32 CurrentInterruptMask; | 67 | u32 CurrentInterruptMask; |
68 | u32 CurrentReadIndex; | 68 | u32 CurrentReadIndex; |
69 | u32 CurrentWriteIndex; | 69 | u32 CurrentWriteIndex; |
70 | u32 BytesAvailToRead; | 70 | u32 BytesAvailToRead; |
71 | u32 BytesAvailToWrite; | 71 | u32 BytesAvailToWrite; |
72 | } RING_BUFFER_DEBUG_INFO; | 72 | }; |
73 | 73 | ||
74 | 74 | ||
75 | 75 | ||
@@ -96,6 +96,6 @@ u32 GetRingBufferInterruptMask(RING_BUFFER_INFO *RingInfo); | |||
96 | void DumpRingInfo(RING_BUFFER_INFO *RingInfo, char *Prefix); | 96 | void DumpRingInfo(RING_BUFFER_INFO *RingInfo, char *Prefix); |
97 | 97 | ||
98 | void RingBufferGetDebugInfo(RING_BUFFER_INFO *RingInfo, | 98 | void RingBufferGetDebugInfo(RING_BUFFER_INFO *RingInfo, |
99 | RING_BUFFER_DEBUG_INFO *DebugInfo); | 99 | struct hv_ring_buffer_debug_info *debug_info); |
100 | 100 | ||
101 | #endif /* _RING_BUFFER_H_ */ | 101 | #endif /* _RING_BUFFER_H_ */ |