[svn-commits] sruffell: linux/trunk r5303 - in /linux/trunk/drivers/dahdi: ./ wctdm24xxp/ w...

[SVN commits to the Digium repositories]

Author: sruffell
Date: Thu Nov 13 16:10:51 2008
New Revision: 5303

URL: http://svn.digium.com/view/dahdi?view=rev&rev=5303
Log:
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.

Modified:
    linux/trunk/drivers/dahdi/voicebus.c
    linux/trunk/drivers/dahdi/voicebus.h
    linux/trunk/drivers/dahdi/wctdm24xxp/base.c
    linux/trunk/drivers/dahdi/wcte12xp/base.c

Modified: linux/trunk/drivers/dahdi/voicebus.c
URL: http://svn.digium.com/view/dahdi/linux/trunk/drivers/dahdi/voicebus.c?view=diff&rev=5303&r1=5302&r2=5303
==============================================================================
--- linux/trunk/drivers/dahdi/voicebus.c (original)
+++ linux/trunk/drivers/dahdi/voicebus.c Thu Nov 13 16:10:51 2008
@@ -599,10 +599,11 @@
 		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.\n",
+			 vb->cache_line_size);
 		pci_access = 0xfe584202;
 		break;
 	}
@@ -1316,6 +1317,7 @@
 		  void (*handle_receive)(void *vbb, void *context),
 		  void (*handle_transmit)(void *vbb, void *context),
 		  void *context, 
+		  u32 debuglevel,
 		  struct voicebus **vbp
 		  )
 {
@@ -1340,6 +1342,7 @@
 		goto cleanup;
 	}
 	memset(vb,0,sizeof(*vb));
+	voicebus_setdebuglevel(vb, debuglevel);
 	/* \todo make sure there is a note that the caller needs to make sure
 	 * board_name stays in memory until voicebus_release is called.
 	 */

Modified: linux/trunk/drivers/dahdi/voicebus.h
URL: http://svn.digium.com/view/dahdi/linux/trunk/drivers/dahdi/voicebus.h?view=diff&rev=5303&r1=5302&r2=5303
==============================================================================
--- linux/trunk/drivers/dahdi/voicebus.h (original)
+++ linux/trunk/drivers/dahdi/voicebus.h Thu Nov 13 16:10:51 2008
@@ -41,6 +41,7 @@
 		  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);

Modified: linux/trunk/drivers/dahdi/wctdm24xxp/base.c
URL: http://svn.digium.com/view/dahdi/linux/trunk/drivers/dahdi/wctdm24xxp/base.c?view=diff&rev=5303&r1=5302&r2=5303
==============================================================================
--- linux/trunk/drivers/dahdi/wctdm24xxp/base.c (original)
+++ linux/trunk/drivers/dahdi/wctdm24xxp/base.c Thu Nov 13 16:10:51 2008
@@ -3879,7 +3879,7 @@
 	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;

Modified: linux/trunk/drivers/dahdi/wcte12xp/base.c
URL: http://svn.digium.com/view/dahdi/linux/trunk/drivers/dahdi/wcte12xp/base.c?view=diff&rev=5303&r1=5302&r2=5303
==============================================================================
--- linux/trunk/drivers/dahdi/wcte12xp/base.c (original)
+++ linux/trunk/drivers/dahdi/wcte12xp/base.c Thu Nov 13 16:10:51 2008
@@ -1609,7 +1609,8 @@
 	init_waitqueue_head(&wc->regq);
 	snprintf(wc->name, sizeof(wc->name)-1, "wcte12xp%d", index);
 	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);
 		ifaces[index] = NULL;