[zaptel-commits] sruffell: branch 1.4 r4598 - /branches/1.4/kernel/wctc4xxp/base.c

[SVN commits to the Zaptel project]

Author: sruffell
Date: Fri Dec 19 11:22:49 2008
New Revision: 4598

URL: http://svn.digium.com/view/zaptel?view=rev&rev=4598
Log:
WARN is defined in newer kernels.  Use WARN_ALWAYS like in DAHDI.

Modified:
    branches/1.4/kernel/wctc4xxp/base.c

Modified: branches/1.4/kernel/wctc4xxp/base.c
URL: http://svn.digium.com/view/zaptel/branches/1.4/kernel/wctc4xxp/base.c?view=diff&rev=4598&r1=4597&r2=4598
==============================================================================
--- branches/1.4/kernel/wctc4xxp/base.c (original)
+++ branches/1.4/kernel/wctc4xxp/base.c Fri Dec 19 11:22:49 2008
@@ -60,7 +60,7 @@
 #	define ALLOC_FLAGS GFP_KERNEL
 #endif
 
-#define WARN() WARN_ON(1)
+#define WARN_ALWAYS() WARN_ON(1)
 
 #define DTE_PRINTK(_lvl, _fmt, _args...) \
 	   printk(KERN_##_lvl "%s: %s: " _fmt, THIS_MODULE->name, \
@@ -2212,7 +2212,7 @@
 	
 	for (i = 0; i < DRING_SIZE; ++i) { 
 		if (!(cmd = alloc_cmd())) {
-			WARN();
+			WARN_ALWAYS();
 			return;
 		}
 		cmd->data_len = SFRAME_SIZE;
@@ -2220,7 +2220,7 @@
 			/* When we're starting the DMA, we should always be
 			 * able to fill the ring....so something is wrong
 			 * here. */
-			WARN();
+			WARN_ALWAYS();
 			free_cmd(cmd);
 			break;
 		}
@@ -2734,7 +2734,7 @@
 {
 	int ret;
 	if ((ret=down_interruptible(&wc->chansem))) {
-		WARN();
+		WARN_ALWAYS();
 		return ret;
 	}
 	ret = __wctc4xxp_setup_channels(wc);