summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2011-10-11 17:25:14 +0200
committerGreg Kroah-Hartman <gregkh@suse.de>2011-10-11 17:51:21 +0200
commit1a2643012fa2262e823b7f11d9732b7fea4c25ce (patch)
treeb194f551ccc018ada709b89a66d1e27ae11fe08d
parentStaging: hv: storvsc: remove last usage of DPRINT_WARN (diff)
downloadlinux-1a2643012fa2262e823b7f11d9732b7fea4c25ce.tar.xz
linux-1a2643012fa2262e823b7f11d9732b7fea4c25ce.zip
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.h2
-rw-r--r--drivers/hv/ring_buffer.c31
-rw-r--r--include/linux/hyperv.h8
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,
u32 hv_get_ringbuffer_interrupt_mask(struct hv_ring_buffer_info *ring_info);
-void hv_dump_ring_info(struct hv_ring_buffer_info *ring_info, char *prefix);
-
void hv_ringbuffer_get_debuginfo(struct hv_ring_buffer_info *ring_info,
struct hv_ring_buffer_debug_info *debug_info);
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)
return (u64)ring_info->ring_buffer->write_index << 32;
}
-
-/*
- *
- * hv_dump_ring_info()
- *
- * Dump out to console the ring buffer info
- *
- */
-void hv_dump_ring_info(struct hv_ring_buffer_info *ring_info, char *prefix)
-{
- u32 bytes_avail_towrite;
- u32 bytes_avail_toread;
-
- hv_get_ringbuffer_availbytes(ring_info,
- &bytes_avail_toread,
- &bytes_avail_towrite);
-
- DPRINT(VMBUS,
- DEBUG_RING_LVL,
- "%s <<ringinfo %p buffer %p avail write %u "
- "avail read %u read idx %u write idx %u>>",
- prefix,
- ring_info,
- ring_info->ring_buffer->buffer,
- bytes_avail_towrite,
- bytes_avail_toread,
- ring_info->ring_buffer->read_index,
- ring_info->ring_buffer->write_index);
-}
-
-
/*
*
* 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);
/* Logging Level */
#define INFO_LVL 6
-#define DEBUG_RING_LVL 9
extern unsigned int vmbus_loglevel;
-#define DPRINT(mod, lvl, fmt, args...) do {\
- if ((mod & (HIWORD(vmbus_loglevel))) && \
- (lvl <= LOWORD(vmbus_loglevel))) \
- printk(KERN_DEBUG #mod": %s() " fmt "\n", __func__, ## args);\
- } while (0)
-
-
struct hv_driver;
struct hv_device;