Skip to content

Commit

Permalink
Staging: hv: remove RING_BUFFER_DEBUG_INFO typedef
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Greg Kroah-Hartman committed Jul 27, 2010
1 parent 3924865 commit 80682b7
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 11 deletions.
4 changes: 2 additions & 2 deletions drivers/staging/hv/channel_mgmt.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
};

/*
Expand Down
12 changes: 6 additions & 6 deletions drivers/staging/hv/ring_buffer.c
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,7 @@ CopyFromRingBuffer(
--*/
void RingBufferGetDebugInfo(RING_BUFFER_INFO *RingInfo,
RING_BUFFER_DEBUG_INFO *DebugInfo)
struct hv_ring_buffer_debug_info *debug_info)
{
u32 bytesAvailToWrite;
u32 bytesAvailToRead;
Expand All @@ -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;
}
}

Expand Down
6 changes: 3 additions & 3 deletions drivers/staging/hv/ring_buffer.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
};



Expand All @@ -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_ */

0 comments on commit 80682b7

Please sign in to comment.