Commit 6ecad52e authored by Dave Jones's avatar Dave Jones

[PATCH] Indentation brain damage

Whoever did the copy_to_user changes a few months back used
a braindamaged editor which screwed the indentation..
parent c12bcd74
...@@ -2034,7 +2034,7 @@ static int cm_ioctl(struct inode *inode, struct file *file, unsigned int cmd, un ...@@ -2034,7 +2034,7 @@ static int cm_ioctl(struct inode *inode, struct file *file, unsigned int cmd, un
if (s->dma_adc.mapped) if (s->dma_adc.mapped)
s->dma_adc.count &= s->dma_adc.fragsize-1; s->dma_adc.count &= s->dma_adc.fragsize-1;
spin_unlock_irqrestore(&s->lock, flags); spin_unlock_irqrestore(&s->lock, flags);
if (copy_to_user((void *)arg, &cinfo, sizeof(cinfo))) if (copy_to_user((void *)arg, &cinfo, sizeof(cinfo)))
return -EFAULT; return -EFAULT;
return 0; return 0;
...@@ -2053,7 +2053,7 @@ static int cm_ioctl(struct inode *inode, struct file *file, unsigned int cmd, un ...@@ -2053,7 +2053,7 @@ static int cm_ioctl(struct inode *inode, struct file *file, unsigned int cmd, un
s->dma_adc.count &= s->dma_adc.fragsize-1; s->dma_adc.count &= s->dma_adc.fragsize-1;
} }
spin_unlock_irqrestore(&s->lock, flags); spin_unlock_irqrestore(&s->lock, flags);
if (copy_to_user((void *)arg, &cinfo, sizeof(cinfo))) if (copy_to_user((void *)arg, &cinfo, sizeof(cinfo)))
return -EFAULT; return -EFAULT;
return 0; return 0;
......
...@@ -1632,7 +1632,7 @@ static int es1370_ioctl(struct inode *inode, struct file *file, unsigned int cmd ...@@ -1632,7 +1632,7 @@ static int es1370_ioctl(struct inode *inode, struct file *file, unsigned int cmd
if (s->dma_adc.mapped) if (s->dma_adc.mapped)
s->dma_adc.count &= s->dma_adc.fragsize-1; s->dma_adc.count &= s->dma_adc.fragsize-1;
spin_unlock_irqrestore(&s->lock, flags); spin_unlock_irqrestore(&s->lock, flags);
if (copy_to_user((void *)arg, &cinfo, sizeof(cinfo))) if (copy_to_user((void *)arg, &cinfo, sizeof(cinfo)))
return -EFAULT; return -EFAULT;
return 0; return 0;
...@@ -1652,7 +1652,7 @@ static int es1370_ioctl(struct inode *inode, struct file *file, unsigned int cmd ...@@ -1652,7 +1652,7 @@ static int es1370_ioctl(struct inode *inode, struct file *file, unsigned int cmd
if (s->dma_dac2.mapped) if (s->dma_dac2.mapped)
s->dma_dac2.count &= s->dma_dac2.fragsize-1; s->dma_dac2.count &= s->dma_dac2.fragsize-1;
spin_unlock_irqrestore(&s->lock, flags); spin_unlock_irqrestore(&s->lock, flags);
if (copy_to_user((void *)arg, &cinfo, sizeof(cinfo))) if (copy_to_user((void *)arg, &cinfo, sizeof(cinfo)))
return -EFAULT; return -EFAULT;
return 0; return 0;
...@@ -2113,7 +2113,7 @@ static int es1370_ioctl_dac(struct inode *inode, struct file *file, unsigned int ...@@ -2113,7 +2113,7 @@ static int es1370_ioctl_dac(struct inode *inode, struct file *file, unsigned int
if (s->dma_dac1.mapped) if (s->dma_dac1.mapped)
s->dma_dac1.count &= s->dma_dac1.fragsize-1; s->dma_dac1.count &= s->dma_dac1.fragsize-1;
spin_unlock_irqrestore(&s->lock, flags); spin_unlock_irqrestore(&s->lock, flags);
if (copy_to_user((void *)arg, &cinfo, sizeof(cinfo))) if (copy_to_user((void *)arg, &cinfo, sizeof(cinfo)))
return -EFAULT; return -EFAULT;
return 0; return 0;
......
...@@ -1820,7 +1820,7 @@ static int es1371_ioctl(struct inode *inode, struct file *file, unsigned int cmd ...@@ -1820,7 +1820,7 @@ static int es1371_ioctl(struct inode *inode, struct file *file, unsigned int cmd
if (s->dma_adc.mapped) if (s->dma_adc.mapped)
s->dma_adc.count &= s->dma_adc.fragsize-1; s->dma_adc.count &= s->dma_adc.fragsize-1;
spin_unlock_irqrestore(&s->lock, flags); spin_unlock_irqrestore(&s->lock, flags);
if (copy_to_user((void *)arg, &cinfo, sizeof(cinfo))) if (copy_to_user((void *)arg, &cinfo, sizeof(cinfo)))
return -EFAULT; return -EFAULT;
return 0; return 0;
...@@ -1840,9 +1840,10 @@ static int es1371_ioctl(struct inode *inode, struct file *file, unsigned int cmd ...@@ -1840,9 +1840,10 @@ static int es1371_ioctl(struct inode *inode, struct file *file, unsigned int cmd
if (s->dma_dac2.mapped) if (s->dma_dac2.mapped)
s->dma_dac2.count &= s->dma_dac2.fragsize-1; s->dma_dac2.count &= s->dma_dac2.fragsize-1;
spin_unlock_irqrestore(&s->lock, flags); spin_unlock_irqrestore(&s->lock, flags);
if (copy_to_user((void *)arg, &cinfo, sizeof(cinfo))) if (copy_to_user((void *)arg, &cinfo, sizeof(cinfo)))
return -EFAULT; return -EFAULT;
return 0; return 0;
case SNDCTL_DSP_GETBLKSIZE: case SNDCTL_DSP_GETBLKSIZE:
if (file->f_mode & FMODE_WRITE) { if (file->f_mode & FMODE_WRITE) {
if ((val = prog_dmabuf_dac2(s))) if ((val = prog_dmabuf_dac2(s)))
...@@ -2291,7 +2292,7 @@ static int es1371_ioctl_dac(struct inode *inode, struct file *file, unsigned int ...@@ -2291,7 +2292,7 @@ static int es1371_ioctl_dac(struct inode *inode, struct file *file, unsigned int
if (s->dma_dac1.mapped) if (s->dma_dac1.mapped)
s->dma_dac1.count &= s->dma_dac1.fragsize-1; s->dma_dac1.count &= s->dma_dac1.fragsize-1;
spin_unlock_irqrestore(&s->lock, flags); spin_unlock_irqrestore(&s->lock, flags);
if (copy_to_user((void *)arg, &cinfo, sizeof(cinfo))) if (copy_to_user((void *)arg, &cinfo, sizeof(cinfo)))
return -EFAULT; return -EFAULT;
return 0; return 0;
......
...@@ -1469,7 +1469,7 @@ static int solo1_ioctl(struct inode *inode, struct file *file, unsigned int cmd, ...@@ -1469,7 +1469,7 @@ static int solo1_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
if (s->dma_adc.mapped) if (s->dma_adc.mapped)
s->dma_adc.count &= s->dma_adc.fragsize-1; s->dma_adc.count &= s->dma_adc.fragsize-1;
spin_unlock_irqrestore(&s->lock, flags); spin_unlock_irqrestore(&s->lock, flags);
if (copy_to_user((void *)arg, &cinfo, sizeof(cinfo))) if (copy_to_user((void *)arg, &cinfo, sizeof(cinfo)))
return -EFAULT; return -EFAULT;
return 0; return 0;
...@@ -1495,7 +1495,7 @@ static int solo1_ioctl(struct inode *inode, struct file *file, unsigned int cmd, ...@@ -1495,7 +1495,7 @@ static int solo1_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
cinfo.bytes, cinfo.blocks, cinfo.ptr, s->dma_dac.buforder, s->dma_dac.numfrag, s->dma_dac.fragshift, cinfo.bytes, cinfo.blocks, cinfo.ptr, s->dma_dac.buforder, s->dma_dac.numfrag, s->dma_dac.fragshift,
s->dma_dac.swptr, s->dma_dac.count, s->dma_dac.fragsize, s->dma_dac.dmasize, s->dma_dac.fragsamples); s->dma_dac.swptr, s->dma_dac.count, s->dma_dac.fragsize, s->dma_dac.dmasize, s->dma_dac.fragsamples);
#endif #endif
if (copy_to_user((void *)arg, &cinfo, sizeof(cinfo))) if (copy_to_user((void *)arg, &cinfo, sizeof(cinfo)))
return -EFAULT; return -EFAULT;
return 0; return 0;
......
...@@ -2760,7 +2760,7 @@ static int ess_ioctl(struct inode *inode, struct file *file, unsigned int cmd, u ...@@ -2760,7 +2760,7 @@ static int ess_ioctl(struct inode *inode, struct file *file, unsigned int cmd, u
if (s->dma_adc.mapped) if (s->dma_adc.mapped)
s->dma_adc.count &= s->dma_adc.fragsize-1; s->dma_adc.count &= s->dma_adc.fragsize-1;
spin_unlock_irqrestore(&s->lock, flags); spin_unlock_irqrestore(&s->lock, flags);
if (copy_to_user((void *)arg, &cinfo, sizeof(cinfo))) if (copy_to_user((void *)arg, &cinfo, sizeof(cinfo)))
return -EFAULT; return -EFAULT;
return 0; return 0;
...@@ -2777,7 +2777,7 @@ static int ess_ioctl(struct inode *inode, struct file *file, unsigned int cmd, u ...@@ -2777,7 +2777,7 @@ static int ess_ioctl(struct inode *inode, struct file *file, unsigned int cmd, u
if (s->dma_dac.mapped) if (s->dma_dac.mapped)
s->dma_dac.count &= s->dma_dac.fragsize-1; s->dma_dac.count &= s->dma_dac.fragsize-1;
spin_unlock_irqrestore(&s->lock, flags); spin_unlock_irqrestore(&s->lock, flags);
if (copy_to_user((void *)arg, &cinfo, sizeof(cinfo))) if (copy_to_user((void *)arg, &cinfo, sizeof(cinfo)))
return -EFAULT; return -EFAULT;
return 0; return 0;
......
...@@ -1815,7 +1815,7 @@ static int m3_ioctl(struct inode *inode, struct file *file, unsigned int cmd, un ...@@ -1815,7 +1815,7 @@ static int m3_ioctl(struct inode *inode, struct file *file, unsigned int cmd, un
if (s->dma_adc.mapped) if (s->dma_adc.mapped)
s->dma_adc.count &= s->dma_adc.fragsize-1; s->dma_adc.count &= s->dma_adc.fragsize-1;
spin_unlock_irqrestore(&card->lock, flags); spin_unlock_irqrestore(&card->lock, flags);
if (copy_to_user((void *)arg, &cinfo, sizeof(cinfo))) if (copy_to_user((void *)arg, &cinfo, sizeof(cinfo)))
return -EFAULT; return -EFAULT;
return 0; return 0;
...@@ -1830,7 +1830,7 @@ static int m3_ioctl(struct inode *inode, struct file *file, unsigned int cmd, un ...@@ -1830,7 +1830,7 @@ static int m3_ioctl(struct inode *inode, struct file *file, unsigned int cmd, un
if (s->dma_dac.mapped) if (s->dma_dac.mapped)
s->dma_dac.count &= s->dma_dac.fragsize-1; s->dma_dac.count &= s->dma_dac.fragsize-1;
spin_unlock_irqrestore(&card->lock, flags); spin_unlock_irqrestore(&card->lock, flags);
if (copy_to_user((void *)arg, &cinfo, sizeof(cinfo))) if (copy_to_user((void *)arg, &cinfo, sizeof(cinfo)))
return -EFAULT; return -EFAULT;
return 0; return 0;
......
...@@ -1803,7 +1803,7 @@ static int sv_ioctl(struct inode *inode, struct file *file, unsigned int cmd, un ...@@ -1803,7 +1803,7 @@ static int sv_ioctl(struct inode *inode, struct file *file, unsigned int cmd, un
if (s->dma_adc.mapped) if (s->dma_adc.mapped)
s->dma_adc.count &= s->dma_adc.fragsize-1; s->dma_adc.count &= s->dma_adc.fragsize-1;
spin_unlock_irqrestore(&s->lock, flags); spin_unlock_irqrestore(&s->lock, flags);
if (copy_to_user((void *)arg, &cinfo, sizeof(cinfo))) if (copy_to_user((void *)arg, &cinfo, sizeof(cinfo)))
return -EFAULT; return -EFAULT;
return 0; return 0;
......
...@@ -2653,7 +2653,7 @@ static struct pci_driver ymfpci_driver = { ...@@ -2653,7 +2653,7 @@ static struct pci_driver ymfpci_driver = {
name: "ymfpci", name: "ymfpci",
id_table: ymf_id_tbl, id_table: ymf_id_tbl,
probe: ymf_probe_one, probe: ymf_probe_one,
remove: __devexit_p(ymf_remove_one), remove: __devexit_p(ymf_remove_one),
suspend: ymf_suspend, suspend: ymf_suspend,
resume: ymf_resume resume: ymf_resume
}; };
......
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