From d2eb4c452ee779999e61678e16ccda44939d769c Mon Sep 17 00:00:00 2001
From: sruffell <sruffell@5390a7c7-147a-4af0-8ec9-7488f05a26cb>
Date: Thu, 13 Nov 2008 22:19:24 +0000
Subject: Make a message about the host cacheline size being unsupported a
 debug only message.  The voicebus interface still works whether the cacheline
 size is supported or not, but the message is confusing to users.

git-svn-id: http://svn.digium.com/svn/zaptel/branches/1.4@4579 5390a7c7-147a-4af0-8ec9-7488f05a26cb
---
 kernel/voicebus.c        | 11 +++++++----
 kernel/voicebus.h        |  1 +
 kernel/wctdm24xxp/base.c |  2 +-
 kernel/wcte12xp/base.c   |  2 +-
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/kernel/voicebus.c b/kernel/voicebus.c
index 80334b1..aabfd8c 100644
--- a/kernel/voicebus.c
+++ b/kernel/voicebus.c
@@ -599,10 +599,11 @@ vb_reset_interface(struct voicebus *vb)
 		pci_access = DEFAULT_PCI_ACCESS | (0x3 << 14);
 		break;
 	default:
-		VB_PRINTK(vb, WARNING, "Host system set a cache size "\
-		 "of %d which is not supported. " \
-		 "Disabling memory write line and memory read line.",
-		 vb->cache_line_size);
+		if (atomic_read(&vb->debuglevel))
+			VB_PRINTK(vb, WARNING, "Host system set a cache size "\
+			 "of %d which is not supported. " \
+			 "Disabling memory write line and memory read line.",
+			 vb->cache_line_size);
 		pci_access = 0xfe584202;
 		break;
 	}
@@ -1315,6 +1316,7 @@ voicebus_init(struct pci_dev *pdev, u32 framesize,
 		  void (*handle_receive)(void *vbb, void *context),
 		  void (*handle_transmit)(void *vbb, void *context),
 		  void *context, 
+		  u32 debuglevel,
 		  struct voicebus **vbp
 		  )
 {
@@ -1342,6 +1344,7 @@ voicebus_init(struct pci_dev *pdev, u32 framesize,
 	/* \todo make sure there is a note that the caller needs to make sure
 	 * board_name stays in memory until voicebus_release is called.
 	 */
+	voicebus_setdebuglevel(vb, debuglevel);
 	vb->board_name = board_name;
 	spin_lock_init(&vb->lock);
 	init_completion(&vb->stopped_completion);
diff --git a/kernel/voicebus.h b/kernel/voicebus.h
index 9a2d1c7..c234690 100644
--- a/kernel/voicebus.h
+++ b/kernel/voicebus.h
@@ -40,6 +40,7 @@ int voicebus_init(struct pci_dev* pdev, u32 framesize,
 		  void (*handle_receive)(void *buffer, void *context),
 		  void (*handle_transmit)(void *buffer, void *context),
 		  void *context, 
+		  u32 debuglevel,
 		  struct voicebus **vb_p);
 void voicebus_release(struct voicebus *vb);
 int voicebus_start(struct voicebus *vb);
diff --git a/kernel/wctdm24xxp/base.c b/kernel/wctdm24xxp/base.c
index 2ccdc3e..bf8a409 100644
--- a/kernel/wctdm24xxp/base.c
+++ b/kernel/wctdm24xxp/base.c
@@ -3876,7 +3876,7 @@ retry:
 	snprintf(wc->board_name, sizeof(wc->board_name)-1, "%s%d",
 		wctdm_driver.name, i);
 	ret = voicebus_init(pdev, SFRAME_SIZE, wc->board_name,
-		handle_receive, handle_transmit, wc, &wc->vb);
+		handle_receive, handle_transmit, wc, debug, &wc->vb);
 	if (ret) {
 		kfree(wc);
 		return ret;
diff --git a/kernel/wcte12xp/base.c b/kernel/wcte12xp/base.c
index eff9ee1..c8ea497 100644
--- a/kernel/wcte12xp/base.c
+++ b/kernel/wcte12xp/base.c
@@ -1610,7 +1610,7 @@ retry:
 	init_waitqueue_head(&wc->regq);
 	snprintf(wc->name, sizeof(wc->name)-1, "wcte12xp%d", x);
 	if ((res=voicebus_init(pdev, SFRAME_SIZE, wc->name,
-		t1_handle_receive, t1_handle_transmit, wc, &wc->vb))) 
+		t1_handle_receive, t1_handle_transmit, wc, debug, &wc->vb)))
 	{
 		WARN_ON(1);
 		kfree(wc);
-- 
cgit v1.2.3