Commit 6619e2b6 authored by Peng Li's avatar Peng Li Committed by David S. Miller

net: cosa: remove trailing whitespaces

This patch removes trailing whitespaces.
Signed-off-by: default avatarPeng Li <lipeng321@huawei.com>
Signed-off-by: default avatarGuangbin Huang <huangguangbin2@huawei.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e84c3e14
...@@ -444,7 +444,7 @@ static int cosa_probe(int base, int irq, int dma) ...@@ -444,7 +444,7 @@ static int cosa_probe(int base, int irq, int dma)
pr_info("invalid DMA %d\n", dma); pr_info("invalid DMA %d\n", dma);
return -1; return -1;
} }
/* and finally, on 16-bit COSA DMA should be 4-7 and /* and finally, on 16-bit COSA DMA should be 4-7 and
* I/O base should not be multiple of 0x10 * I/O base should not be multiple of 0x10
*/ */
if (((base & 0x8) && dma < 4) || (!(base & 0x8) && dma > 3)) { if (((base & 0x8) && dma < 4) || (!(base & 0x8) && dma > 3)) {
...@@ -460,7 +460,7 @@ static int cosa_probe(int base, int irq, int dma) ...@@ -460,7 +460,7 @@ static int cosa_probe(int base, int irq, int dma)
if (!request_region(base, is_8bit(cosa) ? 2 : 4, "cosa")) if (!request_region(base, is_8bit(cosa) ? 2 : 4, "cosa"))
return -1; return -1;
if (cosa_reset_and_read_id(cosa, cosa->id_string) < 0) { if (cosa_reset_and_read_id(cosa, cosa->id_string) < 0) {
printk(KERN_DEBUG "probe at 0x%x failed.\n", base); printk(KERN_DEBUG "probe at 0x%x failed.\n", base);
err = -1; err = -1;
...@@ -480,7 +480,7 @@ static int cosa_probe(int base, int irq, int dma) ...@@ -480,7 +480,7 @@ static int cosa_probe(int base, int irq, int dma)
err = -1; err = -1;
goto err_out; goto err_out;
} }
/* Update the name of the region now we know the type of card */ /* Update the name of the region now we know the type of card */
release_region(base, is_8bit(cosa) ? 2 : 4); release_region(base, is_8bit(cosa) ? 2 : 4);
if (!request_region(base, is_8bit(cosa) ? 2 : 4, cosa->type)) { if (!request_region(base, is_8bit(cosa) ? 2 : 4, cosa->type)) {
printk(KERN_DEBUG "changing name at 0x%x failed.\n", base); printk(KERN_DEBUG "changing name at 0x%x failed.\n", base);
...@@ -532,7 +532,7 @@ static int cosa_probe(int base, int irq, int dma) ...@@ -532,7 +532,7 @@ static int cosa_probe(int base, int irq, int dma)
err = -1; err = -1;
goto err_out1; goto err_out1;
} }
cosa->bouncebuf = kmalloc(COSA_MTU, GFP_KERNEL | GFP_DMA); cosa->bouncebuf = kmalloc(COSA_MTU, GFP_KERNEL | GFP_DMA);
if (!cosa->bouncebuf) { if (!cosa->bouncebuf) {
err = -ENOMEM; err = -ENOMEM;
...@@ -777,7 +777,7 @@ static ssize_t cosa_read(struct file *file, ...@@ -777,7 +777,7 @@ static ssize_t cosa_read(struct file *file,
} }
if (mutex_lock_interruptible(&chan->rlock)) if (mutex_lock_interruptible(&chan->rlock))
return -ERESTARTSYS; return -ERESTARTSYS;
chan->rxdata = kmalloc(COSA_MTU, GFP_DMA | GFP_KERNEL); chan->rxdata = kmalloc(COSA_MTU, GFP_DMA | GFP_KERNEL);
if (!chan->rxdata) { if (!chan->rxdata) {
mutex_unlock(&chan->rlock); mutex_unlock(&chan->rlock);
...@@ -854,7 +854,7 @@ static ssize_t cosa_write(struct file *file, ...@@ -854,7 +854,7 @@ static ssize_t cosa_write(struct file *file,
if (count > COSA_MTU) if (count > COSA_MTU)
count = COSA_MTU; count = COSA_MTU;
/* Allocate the buffer */ /* Allocate the buffer */
kbuf = kmalloc(count, GFP_KERNEL | GFP_DMA); kbuf = kmalloc(count, GFP_KERNEL | GFP_DMA);
if (!kbuf) { if (!kbuf) {
...@@ -934,7 +934,7 @@ static int cosa_open(struct inode *inode, struct file *file) ...@@ -934,7 +934,7 @@ static int cosa_open(struct inode *inode, struct file *file)
goto out; goto out;
} }
chan = cosa->chan + n; chan = cosa->chan + n;
file->private_data = chan; file->private_data = chan;
spin_lock_irqsave(&cosa->lock, flags); spin_lock_irqsave(&cosa->lock, flags);
...@@ -1018,7 +1018,7 @@ static inline int cosa_download(struct cosa_data *cosa, void __user *arg) ...@@ -1018,7 +1018,7 @@ static inline int cosa_download(struct cosa_data *cosa, void __user *arg)
cosa->name, cosa->firmware_status); cosa->name, cosa->firmware_status);
return -EPERM; return -EPERM;
} }
if (copy_from_user(&d, arg, sizeof(d))) if (copy_from_user(&d, arg, sizeof(d)))
return -EFAULT; return -EFAULT;
...@@ -1101,7 +1101,7 @@ static inline int cosa_start(struct cosa_data *cosa, int address) ...@@ -1101,7 +1101,7 @@ static inline int cosa_start(struct cosa_data *cosa, int address)
cosa->firmware_status |= COSA_FW_START; cosa->firmware_status |= COSA_FW_START;
return 0; return 0;
} }
/* Buffer of size at least COSA_MAX_ID_STRING is expected */ /* Buffer of size at least COSA_MAX_ID_STRING is expected */
static inline int cosa_getidstr(struct cosa_data *cosa, char __user *string) static inline int cosa_getidstr(struct cosa_data *cosa, char __user *string)
{ {
...@@ -1140,7 +1140,7 @@ static int cosa_ioctl_common(struct cosa_data *cosa, ...@@ -1140,7 +1140,7 @@ static int cosa_ioctl_common(struct cosa_data *cosa,
case COSAIODOWNLD: /* Download the firmware */ case COSAIODOWNLD: /* Download the firmware */
if (!capable(CAP_SYS_RAWIO)) if (!capable(CAP_SYS_RAWIO))
return -EACCES; return -EACCES;
return cosa_download(cosa, argp); return cosa_download(cosa, argp);
case COSAIORMEM: case COSAIORMEM:
if (!capable(CAP_SYS_RAWIO)) if (!capable(CAP_SYS_RAWIO))
...@@ -1443,7 +1443,7 @@ static int startmicrocode(struct cosa_data *cosa, int address) ...@@ -1443,7 +1443,7 @@ static int startmicrocode(struct cosa_data *cosa, int address)
return -4; return -4;
if (put_wait_data(cosa, '\r') == -1) if (put_wait_data(cosa, '\r') == -1)
return -5; return -5;
if (get_wait_data(cosa) != '\r') if (get_wait_data(cosa) != '\r')
return -6; return -6;
if (get_wait_data(cosa) != '\r') if (get_wait_data(cosa) != '\r')
...@@ -1618,7 +1618,7 @@ static int put_wait_data(struct cosa_data *cosa, int data) ...@@ -1618,7 +1618,7 @@ static int put_wait_data(struct cosa_data *cosa, int data)
cosa->num, cosa_getstatus(cosa)); cosa->num, cosa_getstatus(cosa));
return -1; return -1;
} }
/* The following routine puts the hexadecimal number into the SRP monitor /* The following routine puts the hexadecimal number into the SRP monitor
* and verifies the proper echo of the sent bytes. Returns 0 on success, * and verifies the proper echo of the sent bytes. Returns 0 on success,
* negative number on failure (-1,-3,-5,-7) means that put_wait_data() failed, * negative number on failure (-1,-3,-5,-7) means that put_wait_data() failed,
...@@ -1656,7 +1656,7 @@ static int puthexnumber(struct cosa_data *cosa, int number) ...@@ -1656,7 +1656,7 @@ static int puthexnumber(struct cosa_data *cosa, int number)
* COSA status byte. I have moved the rx/tx/eot interrupt handling into * COSA status byte. I have moved the rx/tx/eot interrupt handling into
* separate functions to make it more readable. These functions are inline, * separate functions to make it more readable. These functions are inline,
* so there should be no overhead of function call. * so there should be no overhead of function call.
* *
* In the COSA bus-master mode, we need to tell the card the address of a * In the COSA bus-master mode, we need to tell the card the address of a
* buffer. Unfortunately, COSA may be too slow for us, so we must busy-wait. * buffer. Unfortunately, COSA may be too slow for us, so we must busy-wait.
* It's time to use the bottom half :-( * It's time to use the bottom half :-(
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment