[svn-commits] sruffell: branch linux/kpfleming/echocan_work r6453 - /linux/team/kpfleming/e...

[SVN commits to the Digium repositories]

Author: sruffell
Date: Wed Apr 22 09:31:04 2009
New Revision: 6453

URL: http://svn.digium.com/svn-view/dahdi?view=rev&rev=6453
Log:
Eliminating new formatting errors from checkpatch.pl.

Modified:
    linux/team/kpfleming/echocan_work/drivers/dahdi/dahdi-base.c
    linux/team/kpfleming/echocan_work/drivers/dahdi/dahdi_echocan_kb1.c
    linux/team/kpfleming/echocan_work/drivers/dahdi/dahdi_echocan_mg2.c
    linux/team/kpfleming/echocan_work/drivers/dahdi/ecdis.h

Modified: linux/team/kpfleming/echocan_work/drivers/dahdi/dahdi-base.c
URL: http://svn.digium.com/svn-view/dahdi/linux/team/kpfleming/echocan_work/drivers/dahdi/dahdi-base.c?view=diff&rev=6453&r1=6452&r2=6453
==============================================================================
--- linux/team/kpfleming/echocan_work/drivers/dahdi/dahdi-base.c (original)
+++ linux/team/kpfleming/echocan_work/drivers/dahdi/dahdi-base.c Wed Apr 22 09:31:04 2009
@@ -3680,7 +3680,8 @@
 		if (!chans[j])
 			return -EINVAL;
 
-		if (!(chan = kmalloc(sizeof(*chan), GFP_KERNEL)))
+		chan = kmalloc(sizeof(*chan), GFP_KERNEL);
+		if (!chan)
 			return -ENOMEM;
 
 		/* lock channel */

Modified: linux/team/kpfleming/echocan_work/drivers/dahdi/dahdi_echocan_kb1.c
URL: http://svn.digium.com/svn-view/dahdi/linux/team/kpfleming/echocan_work/drivers/dahdi/dahdi_echocan_kb1.c?view=diff&rev=6453&r1=6452&r2=6453
==============================================================================
--- linux/team/kpfleming/echocan_work/drivers/dahdi/dahdi_echocan_kb1.c (original)
+++ linux/team/kpfleming/echocan_work/drivers/dahdi/dahdi_echocan_kb1.c Wed Apr 22 09:31:04 2009
@@ -534,7 +534,7 @@
 	if (pvt->use_nlp) {
 		if (pvt->aggressive) {
 			if ((pvt->HCNTR_d < AGGRESSIVE_HCNTR) && (pvt->Ly_i > (pvt->Lu_i << 1))) {
-				for (k=0; k < 2; k++) {
+				for (k = 0; k < 2; k++) {
 					u = u * (pvt->Lu_i >> DEFAULT_SIGMA_LU_I) / ((pvt->Ly_i >> (DEFAULT_SIGMA_LY_I)) + 1);
 				}
 #ifdef MEC2_STATS_DETAILED
@@ -547,7 +547,7 @@
 		} else {
 			if (pvt->HCNTR_d == 0) {
 				if ((pvt->Ly_i/(pvt->Lu_i + 1)) > DEFAULT_SUPPR_I) {
-					for (k=0; k < 1; k++) {
+					for (k = 0; k < 1; k++) {
 						u = u * (pvt->Lu_i >> DEFAULT_SIGMA_LU_I) / ((pvt->Ly_i >> (DEFAULT_SIGMA_LY_I + 2)) + 1);
 					}
 #ifdef MEC2_STATS_DETAILED

Modified: linux/team/kpfleming/echocan_work/drivers/dahdi/dahdi_echocan_mg2.c
URL: http://svn.digium.com/svn-view/dahdi/linux/team/kpfleming/echocan_work/drivers/dahdi/dahdi_echocan_mg2.c?view=diff&rev=6453&r1=6452&r2=6453
==============================================================================
--- linux/team/kpfleming/echocan_work/drivers/dahdi/dahdi_echocan_mg2.c (original)
+++ linux/team/kpfleming/echocan_work/drivers/dahdi/dahdi_echocan_mg2.c Wed Apr 22 09:31:04 2009
@@ -674,7 +674,7 @@
 	if (pvt->use_nlp) {
 		if (pvt->aggressive) {
 			if ((pvt->HCNTR_d < AGGRESSIVE_HCNTR) && (pvt->Ly_i > (pvt->Lu_i << 1))) {
-				for (k=0; k < 2; k++) {
+				for (k = 0; k < 2; k++) {
 					u = u * (pvt->Lu_i >> DEFAULT_SIGMA_LU_I) / ((pvt->Ly_i >> (DEFAULT_SIGMA_LY_I)) + 1);
 				}
 #ifdef MEC2_STATS_DETAILED
@@ -687,7 +687,7 @@
 		} else {
 			if (pvt->HCNTR_d == 0) {
 				if ((pvt->Ly_i/(pvt->Lu_i + 1)) > DEFAULT_SUPPR_I) {
-					for (k=0; k < 1; k++) {
+					for (k = 0; k < 1; k++) {
 						u = u * (pvt->Lu_i >> DEFAULT_SIGMA_LU_I) / ((pvt->Ly_i >> (DEFAULT_SIGMA_LY_I + 2)) + 1);
 					}
 #ifdef MEC2_STATS_DETAILED

Modified: linux/team/kpfleming/echocan_work/drivers/dahdi/ecdis.h
URL: http://svn.digium.com/svn-view/dahdi/linux/team/kpfleming/echocan_work/drivers/dahdi/ecdis.h?view=diff&rev=6453&r1=6452&r2=6453
==============================================================================
--- linux/team/kpfleming/echocan_work/drivers/dahdi/ecdis.h (original)
+++ linux/team/kpfleming/echocan_work/drivers/dahdi/ecdis.h Wed Apr 22 09:31:04 2009
@@ -56,7 +56,7 @@
 						    int16_t amp)
 {
 	int16_t notched;
-	
+
     	notched = biquad2 (&det->notch, amp);
     	/* Estimate the overall energy in the channel, and the energy in
 	   the notch (i.e. overall channel energy - tone energy => noise).
@@ -66,7 +66,7 @@
 	   blip every time the phase reverses */
         det->channel_level += ((abs(amp) - det->channel_level) >> 5);
 	det->notch_level += ((abs(notched) - det->notch_level) >> 4);
-  	if (det->channel_level >= 70) {
+	if (det->channel_level >= 70) {
 		/* There is adequate energy in the channel. Is it mostly at 2100Hz? */
 		if (det->notch_level*6 < det->channel_level) {
 			det->tone_cycle_duration++;
@@ -91,7 +91,7 @@
 		} else {
 			det->tone_present = FALSE;
 		}
-	} else { 
+	} else {
 		det->tone_present = FALSE;
 		det->tone_cycle_duration = 0;
 		det->good_cycles = 0;