diff options
| author | thl <thl@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2008-12-16 19:39:34 +0000 | 
|---|---|---|
| committer | thl <thl@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2008-12-16 19:39:34 +0000 | 
| commit | 73a104c025f3230baa7e6e01250ca8825ee4342f (patch) | |
| tree | bef25e22147228d75c8821e51e6489ab97159ed7 /target/linux/ifxmips/files/drivers/char | |
| parent | 424b5aa79faf5193aaa59088f1e9eb9c7c9f2112 (diff) | |
[ifxmips] many more code cleanups for checkpatch.pl, most flagged as errors
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@13665 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ifxmips/files/drivers/char')
| -rw-r--r-- | target/linux/ifxmips/files/drivers/char/ifxmips_ssc.c | 25 | 
1 files changed, 7 insertions, 18 deletions
| diff --git a/target/linux/ifxmips/files/drivers/char/ifxmips_ssc.c b/target/linux/ifxmips/files/drivers/char/ifxmips_ssc.c index 5d6135602..f8c5f3017 100644 --- a/target/linux/ifxmips/files/drivers/char/ifxmips_ssc.c +++ b/target/linux/ifxmips/files/drivers/char/ifxmips_ssc.c @@ -1251,24 +1251,13 @@ static int ssc_session(char *tx_buf, u32 tx_len, char *rx_buf, u32 rx_len)  	else  		eff_size = tx_len; -	//4 bytes alignment,  required by driver -	/* change by TaiCheng */ -	//if (in_irq()){ -	if (1) { -		ssc_tx_buf = kmalloc(sizeof(char) * -					 ((eff_size + 3) & (~3)), -					  GFP_ATOMIC); -		ssc_rx_buf = kmalloc(sizeof(char) * -					 ((eff_size + 3) & (~3)), -					  GFP_ATOMIC); -	} else { -		ssc_tx_buf = kmalloc(sizeof(char) * -					 ((eff_size + 3) & (~3)), -					  GFP_KERNEL); -		ssc_rx_buf = kmalloc(sizeof(char) * -					 ((eff_size + 3) & (~3)), -					  GFP_KERNEL); -	} +	/* 4 bytes alignment, required by driver */ +	ssc_tx_buf = kmalloc(sizeof(char) * +				 ((eff_size + 3) & (~3)), +				  GFP_ATOMIC); +	ssc_rx_buf = kmalloc(sizeof(char) * +				 ((eff_size + 3) & (~3)), +				  GFP_ATOMIC);  	if (ssc_tx_buf == NULL || ssc_rx_buf == NULL) {  		printk("no memory for size of %d\n", eff_size);  		ret = -ENOMEM; | 
