diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2011-10-11 11:25:14 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-10-11 11:51:21 -0400 |
commit | 1a2643012fa2262e823b7f11d9732b7fea4c25ce (patch) | |
tree | b194f551ccc018ada709b89a66d1e27ae11fe08d | |
parent | d181daa06dd72fa88652b1d8bf723570a9fc55ea (diff) |
Staging: hv: remove last user of DPRINT() macro
This also removed the unused function hv_dump_ring_info().
Cc: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r-- | drivers/hv/hyperv_vmbus.h | 2 | ||||
-rw-r--r-- | drivers/hv/ring_buffer.c | 31 | ||||
-rw-r--r-- | include/linux/hyperv.h | 8 |
3 files changed, 0 insertions, 41 deletions
diff --git a/drivers/hv/hyperv_vmbus.h b/drivers/hv/hyperv_vmbus.h index 8261cb64931b..0aee1122734c 100644 --- a/drivers/hv/hyperv_vmbus.h +++ b/drivers/hv/hyperv_vmbus.h | |||
@@ -529,8 +529,6 @@ int hv_ringbuffer_read(struct hv_ring_buffer_info *ring_info, | |||
529 | 529 | ||
530 | u32 hv_get_ringbuffer_interrupt_mask(struct hv_ring_buffer_info *ring_info); | 530 | u32 hv_get_ringbuffer_interrupt_mask(struct hv_ring_buffer_info *ring_info); |
531 | 531 | ||
532 | void hv_dump_ring_info(struct hv_ring_buffer_info *ring_info, char *prefix); | ||
533 | |||
534 | void hv_ringbuffer_get_debuginfo(struct hv_ring_buffer_info *ring_info, | 532 | void hv_ringbuffer_get_debuginfo(struct hv_ring_buffer_info *ring_info, |
535 | struct hv_ring_buffer_debug_info *debug_info); | 533 | struct hv_ring_buffer_debug_info *debug_info); |
536 | 534 | ||
diff --git a/drivers/hv/ring_buffer.c b/drivers/hv/ring_buffer.c index f594ed09d7e0..8af25a097d75 100644 --- a/drivers/hv/ring_buffer.c +++ b/drivers/hv/ring_buffer.c | |||
@@ -172,37 +172,6 @@ hv_get_ring_bufferindices(struct hv_ring_buffer_info *ring_info) | |||
172 | return (u64)ring_info->ring_buffer->write_index << 32; | 172 | return (u64)ring_info->ring_buffer->write_index << 32; |
173 | } | 173 | } |
174 | 174 | ||
175 | |||
176 | /* | ||
177 | * | ||
178 | * hv_dump_ring_info() | ||
179 | * | ||
180 | * Dump out to console the ring buffer info | ||
181 | * | ||
182 | */ | ||
183 | void hv_dump_ring_info(struct hv_ring_buffer_info *ring_info, char *prefix) | ||
184 | { | ||
185 | u32 bytes_avail_towrite; | ||
186 | u32 bytes_avail_toread; | ||
187 | |||
188 | hv_get_ringbuffer_availbytes(ring_info, | ||
189 | &bytes_avail_toread, | ||
190 | &bytes_avail_towrite); | ||
191 | |||
192 | DPRINT(VMBUS, | ||
193 | DEBUG_RING_LVL, | ||
194 | "%s <<ringinfo %p buffer %p avail write %u " | ||
195 | "avail read %u read idx %u write idx %u>>", | ||
196 | prefix, | ||
197 | ring_info, | ||
198 | ring_info->ring_buffer->buffer, | ||
199 | bytes_avail_towrite, | ||
200 | bytes_avail_toread, | ||
201 | ring_info->ring_buffer->read_index, | ||
202 | ring_info->ring_buffer->write_index); | ||
203 | } | ||
204 | |||
205 | |||
206 | /* | 175 | /* |
207 | * | 176 | * |
208 | * hv_copyfrom_ringbuffer() | 177 | * hv_copyfrom_ringbuffer() |
diff --git a/include/linux/hyperv.h b/include/linux/hyperv.h index 097d6dbe685a..4fa32ec43aa4 100644 --- a/include/linux/hyperv.h +++ b/include/linux/hyperv.h | |||
@@ -722,17 +722,9 @@ extern void vmbus_ontimer(unsigned long data); | |||
722 | 722 | ||
723 | /* Logging Level */ | 723 | /* Logging Level */ |
724 | #define INFO_LVL 6 | 724 | #define INFO_LVL 6 |
725 | #define DEBUG_RING_LVL 9 | ||
726 | 725 | ||
727 | extern unsigned int vmbus_loglevel; | 726 | extern unsigned int vmbus_loglevel; |
728 | 727 | ||
729 | #define DPRINT(mod, lvl, fmt, args...) do {\ | ||
730 | if ((mod & (HIWORD(vmbus_loglevel))) && \ | ||
731 | (lvl <= LOWORD(vmbus_loglevel))) \ | ||
732 | printk(KERN_DEBUG #mod": %s() " fmt "\n", __func__, ## args);\ | ||
733 | } while (0) | ||
734 | |||
735 | |||
736 | struct hv_driver; | 728 | struct hv_driver; |
737 | struct hv_device; | 729 | struct hv_device; |
738 | 730 | ||