[PATCH] Indentation brain damage

Whoever did the copy_to_user changes a few months back used
a braindamaged editor which screwed the indentation..

diff --git a/sound/oss/cmpci.c b/sound/oss/cmpci.c
index 6899454d7c28f85502060c775b57ae591fd7293b..22a7f0ea64816e49c8dfdb1f49e258cbef09690c 100644 (file)
--- a/sound/oss/cmpci.c
+++ b/sound/oss/cmpci.c
@@ -2034,7 +2034,7 @@ static int cm_ioctl(struct inode *inode, struct file *file, unsigned int cmd, un
                if (s->dma_adc.mapped)
                        s->dma_adc.count &= s->dma_adc.fragsize-1;
                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 0;
 
@@ -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;
                }
                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 0;
 

diff --git a/sound/oss/es1370.c b/sound/oss/es1370.c
index fe7e971804cade9a81278280ef28f77c67779b8a..3f0a251bff97e3b7c5af29592be17c32b71cab41 100644 (file)
--- a/sound/oss/es1370.c
+++ b/sound/oss/es1370.c
@@ -1632,7 +1632,7 @@ static int es1370_ioctl(struct inode *inode, struct file *file, unsigned int cmd
                if (s->dma_adc.mapped)
                        s->dma_adc.count &= s->dma_adc.fragsize-1;
                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 0;
 
@@ -1652,7 +1652,7 @@ static int es1370_ioctl(struct inode *inode, struct file *file, unsigned int cmd
                if (s->dma_dac2.mapped)
                        s->dma_dac2.count &= s->dma_dac2.fragsize-1;
                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 0;
 
@@ -2113,7 +2113,7 @@ static int es1370_ioctl_dac(struct inode *inode, struct file *file, unsigned int
                if (s->dma_dac1.mapped)
                        s->dma_dac1.count &= s->dma_dac1.fragsize-1;
                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 0;
 

diff --git a/sound/oss/es1371.c b/sound/oss/es1371.c
index 0c4baff6b1700e571778956526c8d0f87101aaf3..60331859f645b0fb0206388fb01c27112bfbd897 100644 (file)
--- a/sound/oss/es1371.c
+++ b/sound/oss/es1371.c
@@ -1820,7 +1820,7 @@ static int es1371_ioctl(struct inode *inode, struct file *file, unsigned int cmd
                if (s->dma_adc.mapped)
                        s->dma_adc.count &= s->dma_adc.fragsize-1;
                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 0;
 
@@ -1840,9 +1840,10 @@ static int es1371_ioctl(struct inode *inode, struct file *file, unsigned int cmd
                if (s->dma_dac2.mapped)
                        s->dma_dac2.count &= s->dma_dac2.fragsize-1;
                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 0;
+
         case SNDCTL_DSP_GETBLKSIZE:
                if (file->f_mode & FMODE_WRITE) {
                        if ((val = prog_dmabuf_dac2(s)))
@@ -2291,7 +2292,7 @@ static int es1371_ioctl_dac(struct inode *inode, struct file *file, unsigned int
                if (s->dma_dac1.mapped)
                        s->dma_dac1.count &= s->dma_dac1.fragsize-1;
                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 0;
 

diff --git a/sound/oss/esssolo1.c b/sound/oss/esssolo1.c
index e1a1408bee54b4286fd81d7fcc771d032279d6bb..c3ac13446810b6975c821ebe5e2884fb330bbfcb 100644 (file)
--- a/sound/oss/esssolo1.c
+++ b/sound/oss/esssolo1.c
@@ -1469,7 +1469,7 @@ static int solo1_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
                if (s->dma_adc.mapped)
                        s->dma_adc.count &= s->dma_adc.fragsize-1;
                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 0;
 
@@ -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,
                       s->dma_dac.swptr, s->dma_dac.count, s->dma_dac.fragsize, s->dma_dac.dmasize, s->dma_dac.fragsamples);
 #endif
-                if (copy_to_user((void *)arg, &cinfo, sizeof(cinfo)))
+               if (copy_to_user((void *)arg, &cinfo, sizeof(cinfo)))
                        return -EFAULT;
                return 0;
 

diff --git a/sound/oss/maestro.c b/sound/oss/maestro.c
index c29b7f657f59c94d2e1e98547264952b3492c105..132d312a0be45285acd8296bd4496f9c1c1c4501 100644 (file)
--- a/sound/oss/maestro.c
+++ b/sound/oss/maestro.c
@@ -2760,7 +2760,7 @@ static int ess_ioctl(struct inode *inode, struct file *file, unsigned int cmd, u
                if (s->dma_adc.mapped)
                        s->dma_adc.count &= s->dma_adc.fragsize-1;
                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 0;
 
@@ -2777,7 +2777,7 @@ static int ess_ioctl(struct inode *inode, struct file *file, unsigned int cmd, u
                if (s->dma_dac.mapped)
                        s->dma_dac.count &= s->dma_dac.fragsize-1;
                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 0;
 

diff --git a/sound/oss/maestro3.c b/sound/oss/maestro3.c
index f0bd7d7ec7fabf25d031cb5137e367f1e35d2005..4a32c70b8d7376a9da031d587c01d78a8a47d810 100644 (file)
--- a/sound/oss/maestro3.c
+++ b/sound/oss/maestro3.c
@@ -1815,7 +1815,7 @@ static int m3_ioctl(struct inode *inode, struct file *file, unsigned int cmd, un
         if (s->dma_adc.mapped)
             s->dma_adc.count &= s->dma_adc.fragsize-1;
         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 0;
 
@@ -1830,7 +1830,7 @@ static int m3_ioctl(struct inode *inode, struct file *file, unsigned int cmd, un
         if (s->dma_dac.mapped)
             s->dma_dac.count &= s->dma_dac.fragsize-1;
         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 0;
 

diff --git a/sound/oss/sonicvibes.c b/sound/oss/sonicvibes.c
index 79c35a9c53a9a8971dda7b6a0e78ac8daa660f50..387c2f76f3175c81d97ba3f8a42e536e5fe6c938 100644 (file)
--- a/sound/oss/sonicvibes.c
+++ b/sound/oss/sonicvibes.c
@@ -1803,7 +1803,7 @@ static int sv_ioctl(struct inode *inode, struct file *file, unsigned int cmd, un
                if (s->dma_adc.mapped)
                        s->dma_adc.count &= s->dma_adc.fragsize-1;
                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 0;
 

diff --git a/sound/oss/ymfpci.c b/sound/oss/ymfpci.c
index 7b02ce17d47761307d223764df483df5d8033207..a0012f93091b6cac2b7d423162a83539406fad4a 100644 (file)
--- a/sound/oss/ymfpci.c
+++ b/sound/oss/ymfpci.c
@@ -2653,7 +2653,7 @@ static struct pci_driver ymfpci_driver = {
        name:           "ymfpci",
        id_table:       ymf_id_tbl,
        probe:          ymf_probe_one,
-       remove:         __devexit_p(ymf_remove_one),
+       remove:         __devexit_p(ymf_remove_one),
        suspend:        ymf_suspend,
        resume:         ymf_resume
 };