V4L/DVB (12732): cx25821: fix bad whitespacing

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/staging/cx25821/Kconfig b/drivers/staging/cx25821/Kconfig
index 8887115..df7756a 100644 (file)
--- a/drivers/staging/cx25821/Kconfig
+++ b/drivers/staging/cx25821/Kconfig
@@ -15,7 +15,7 @@ config VIDEO_CX25821
 
          To compile this driver as a module, choose M here: the
          module will be called cx25821
-         
+
 config VIDEO_CX25821_ALSA
        tristate "Conexant 25821 DMA audio support"
        depends on VIDEO_CX25821 && SND && EXPERIMENTAL
@@ -30,5 +30,5 @@ config VIDEO_CX25821_ALSA
          PCI device.
 
          To compile this driver as a module, choose M here: the
-         module will be called cx25821-alsa.     
+         module will be called cx25821-alsa.
 

diff --git a/drivers/staging/cx25821/cx25821-alsa.c b/drivers/staging/cx25821/cx25821-alsa.c
index 6b2e86a..3ab5641 100644 (file)
--- a/drivers/staging/cx25821/cx25821-alsa.c
+++ b/drivers/staging/cx25821/cx25821-alsa.c
@@ -72,7 +72,7 @@ struct cx25821_audio_dev {
 
        unsigned long iobase;
        spinlock_t                 reg_lock;
-       atomic_t                           count;
+       atomic_t                           count;
 
        unsigned int               dma_size;
        unsigned int               period_size;

diff --git a/drivers/staging/cx25821/cx25821-audio-upstream.c b/drivers/staging/cx25821/cx25821-audio-upstream.c
index 9138767..376c953 100644 (file)
--- a/drivers/staging/cx25821/cx25821-audio-upstream.c
+++ b/drivers/staging/cx25821/cx25821-audio-upstream.c
@@ -45,8 +45,8 @@ static int _intr_msk = FLD_AUD_SRC_RISCI1 | FLD_AUD_SRC_OF | FLD_AUD_SRC_SYNC |
 \r
 \r
 int cx25821_sram_channel_setup_upstream_audio(struct cx25821_dev *dev,\r
-                                                   struct sram_channel *ch,\r
-                                                   unsigned int bpl, u32 risc)\r
+                                                   struct sram_channel *ch,\r
+                                                   unsigned int bpl, u32 risc)\r
 {\r
        unsigned int i, lines;\r
        u32 cdt;\r
@@ -66,7 +66,7 @@ int cx25821_sram_channel_setup_upstream_audio(struct cx25821_dev *dev,
     \r
     if (lines > 3)     \r
     {\r
-        lines = 3;\r
+       lines = 3;\r
     }\r
     \r
        BUG_ON(lines < 2);\r
@@ -87,7 +87,7 @@ int cx25821_sram_channel_setup_upstream_audio(struct cx25821_dev *dev,
        cx_write(ch->cmds_start +  8, cdt);                     \r
        cx_write(ch->cmds_start + 12, AUDIO_CDT_SIZE_QW);       \r
        cx_write(ch->cmds_start + 16, ch->ctrl_start);          \r
-                                               \r
+                                              \r
        //IQ size\r
        cx_write(ch->cmds_start + 20, AUDIO_IQ_SIZE_DW);        \r
 \r
@@ -105,40 +105,40 @@ int cx25821_sram_channel_setup_upstream_audio(struct cx25821_dev *dev,
 \r
 \r
 static __le32 *cx25821_risc_field_upstream_audio( struct cx25821_dev *dev, __le32 *rp, \r
-                                                  dma_addr_t databuf_phys_addr,\r
-                                                  unsigned int bpl, int fifo_enable)\r
+                                                 dma_addr_t databuf_phys_addr,\r
+                                                 unsigned int bpl, int fifo_enable)\r
 {\r
        unsigned int line;\r
     struct sram_channel *sram_ch = &dev->sram_channels[dev->_audio_upstream_channel_select];\r
     int offset = 0;\r
-                \r
+               \r
     \r
        /* scan lines */\r
        for (line = 0; line < LINES_PER_AUDIO_BUFFER; line++) \r
     {          \r
                *(rp++) = cpu_to_le32(RISC_READ|RISC_SOL|RISC_EOL|bpl); \r
-        *(rp++) = cpu_to_le32(databuf_phys_addr + offset);          \r
-               *(rp++) = cpu_to_le32(0); /* bits 63-32 */                       \r
+       *(rp++) = cpu_to_le32(databuf_phys_addr + offset);          \r
+               *(rp++) = cpu_to_le32(0); /* bits 63-32 */                       \r
 \r
-        // Check if we need to enable the FIFO after the first 3 lines \r
-        // For the upstream audio channel, the risc engine will enable the FIFO. \r
-        if ( fifo_enable && line == 2 )\r
+       // Check if we need to enable the FIFO after the first 3 lines \r
+       // For the upstream audio channel, the risc engine will enable the FIFO. \r
+       if ( fifo_enable && line == 2 )\r
                {\r
                        *(rp++) = RISC_WRITECR;\r
                        *(rp++) = sram_ch->dma_ctl;\r
                        *(rp++) = sram_ch->fld_aud_fifo_en;\r
                        *(rp++) = 0x00000020;\r
-       }        \r
-        \r
-        offset += AUDIO_LINE_SIZE;\r
+       }        \r
+       \r
+       offset += AUDIO_LINE_SIZE;\r
        }\r
-         \r
+        \r
        return rp;\r
 }\r
 \r
 int cx25821_risc_buffer_upstream_audio( struct cx25821_dev *dev, \r
-                                  struct pci_dev *pci, \r
-                                  unsigned int bpl, unsigned int lines)\r
+                                 struct pci_dev *pci, \r
+                                 unsigned int bpl, unsigned int lines)\r
 {\r
        __le32 *rp;\r
     int fifo_enable = 0;\r
@@ -148,7 +148,7 @@ int cx25821_risc_buffer_upstream_audio( struct cx25821_dev *dev,
     int risc_flag = RISC_CNT_INC;\r
     dma_addr_t   risc_phys_jump_addr;\r
 \r
-        \r
+       \r
        /* Virtual address of Risc buffer program */\r
        rp = dev->_risc_virt_addr;\r
     \r
@@ -158,48 +158,48 @@ int cx25821_risc_buffer_upstream_audio( struct cx25821_dev *dev,
     \r
     for( frame = 0; frame < NUM_AUDIO_FRAMES; frame++ )\r
     {        \r
-        databuf_offset = frame_size * frame;        \r
-                \r
-        if( frame == 0 )\r
-        {\r
-            fifo_enable = 1;\r
-            risc_flag = RISC_CNT_RESET;   \r
-        }\r
-        else\r
-        {\r
-            fifo_enable = 0;\r
-            risc_flag = RISC_CNT_INC;\r
-        }\r
-        \r
-        //Calculate physical jump address \r
-        if( (frame+1) == NUM_AUDIO_FRAMES )\r
-        {\r
-            risc_phys_jump_addr = dev->_risc_phys_start_addr + RISC_SYNC_INSTRUCTION_SIZE;        \r
-        }\r
-        else\r
-        {\r
-            risc_phys_jump_addr = dev->_risc_phys_start_addr + RISC_SYNC_INSTRUCTION_SIZE + AUDIO_RISC_DMA_BUF_SIZE*(frame+1);        \r
-        }\r
-        \r
-        rp = cx25821_risc_field_upstream_audio(dev, rp, dev->_audiodata_buf_phys_addr+databuf_offset, bpl, fifo_enable);       \r
-         \r
-        \r
-        if( USE_RISC_NOOP_AUDIO )\r
-        {\r
-            for( i = 0; i < NUM_NO_OPS; i++ )\r
-            {\r
-                *(rp++) = cpu_to_le32(RISC_NOOP);\r
-            }\r
-        }\r
-        \r
-\r
-        // Loop to (Nth)FrameRISC or to Start of Risc program & generate IRQ \r
-        *(rp++)  = cpu_to_le32(RISC_JUMP|RISC_IRQ1|risc_flag);      \r
-        *(rp++)  = cpu_to_le32(risc_phys_jump_addr);            \r
-        *(rp++)  = cpu_to_le32(0);  \r
-\r
-        //Recalculate virtual address based on frame index \r
-        rp = dev->_risc_virt_addr + RISC_SYNC_INSTRUCTION_SIZE/4 + (AUDIO_RISC_DMA_BUF_SIZE*(frame+1)/4 ) ;         \r
+       databuf_offset = frame_size * frame;        \r
+               \r
+       if( frame == 0 )\r
+       {\r
+           fifo_enable = 1;\r
+           risc_flag = RISC_CNT_RESET;   \r
+       }\r
+       else\r
+       {\r
+           fifo_enable = 0;\r
+           risc_flag = RISC_CNT_INC;\r
+       }\r
+       \r
+       //Calculate physical jump address \r
+       if( (frame+1) == NUM_AUDIO_FRAMES )\r
+       {\r
+           risc_phys_jump_addr = dev->_risc_phys_start_addr + RISC_SYNC_INSTRUCTION_SIZE;        \r
+       }\r
+       else\r
+       {\r
+           risc_phys_jump_addr = dev->_risc_phys_start_addr + RISC_SYNC_INSTRUCTION_SIZE + AUDIO_RISC_DMA_BUF_SIZE*(frame+1);        \r
+       }\r
+       \r
+       rp = cx25821_risc_field_upstream_audio(dev, rp, dev->_audiodata_buf_phys_addr+databuf_offset, bpl, fifo_enable);       \r
+        \r
+       \r
+       if( USE_RISC_NOOP_AUDIO )\r
+       {\r
+           for( i = 0; i < NUM_NO_OPS; i++ )\r
+           {\r
+               *(rp++) = cpu_to_le32(RISC_NOOP);\r
+           }\r
+       }\r
+       \r
+\r
+       // Loop to (Nth)FrameRISC or to Start of Risc program & generate IRQ \r
+       *(rp++)  = cpu_to_le32(RISC_JUMP|RISC_IRQ1|risc_flag);      \r
+       *(rp++)  = cpu_to_le32(risc_phys_jump_addr);            \r
+       *(rp++)  = cpu_to_le32(0);  \r
+\r
+       //Recalculate virtual address based on frame index \r
+       rp = dev->_risc_virt_addr + RISC_SYNC_INSTRUCTION_SIZE/4 + (AUDIO_RISC_DMA_BUF_SIZE*(frame+1)/4 ) ;         \r
     }\r
     \r
        return 0;\r
@@ -228,10 +228,10 @@ void cx25821_stop_upstream_audio(struct cx25821_dev *dev)
     \r
     if( !dev->_audio_is_running )\r
     {\r
-        printk("cx25821: No audio file is currently running so return!\n");\r
-        return;\r
+       printk("cx25821: No audio file is currently running so return!\n");\r
+       return;\r
     }\r
-        \r
+       \r
     //Disable RISC interrupts\r
     cx_write( sram_ch->int_msk, 0 );\r
     \r
@@ -241,8 +241,8 @@ void cx25821_stop_upstream_audio(struct cx25821_dev *dev)
 \r
     //Clear data buffer memory\r
     if( dev->_audiodata_buf_virt_addr )\r
-        memset( dev->_audiodata_buf_virt_addr, 0, dev->_audiodata_buf_size ); \r
-                \r
+       memset( dev->_audiodata_buf_virt_addr, 0, dev->_audiodata_buf_size ); \r
+               \r
     dev->_audio_is_running       = 0;\r
     dev->_is_first_audio_frame   = 0;\r
     dev->_audioframe_count       = 0;\r
@@ -250,12 +250,12 @@ void cx25821_stop_upstream_audio(struct cx25821_dev *dev)
     \r
     if( dev->_irq_audio_queues )\r
     {\r
-        kfree(dev->_irq_audio_queues); \r
-        dev->_irq_audio_queues = NULL; \r
+       kfree(dev->_irq_audio_queues); \r
+       dev->_irq_audio_queues = NULL; \r
     }        \r
     \r
     if( dev->_audiofilename != NULL )\r
-        kfree(dev->_audiofilename);  \r
+       kfree(dev->_audiofilename);  \r
 }\r
 \r
 \r
@@ -263,7 +263,7 @@ void cx25821_free_mem_upstream_audio(struct cx25821_dev *dev)
 {\r
     if( dev->_audio_is_running )\r
     {\r
-        cx25821_stop_upstream_audio(dev);\r
+       cx25821_stop_upstream_audio(dev);\r
     }\r
 \r
     cx25821_free_memory_audio(dev);\r
@@ -286,69 +286,69 @@ int cx25821_get_audio_data(struct cx25821_dev *dev, struct sram_channel *sram_ch
 \r
     \r
     if( dev->_audiofile_status == END_OF_FILE )   \r
-        return 0;\r
-        \r
+       return 0;\r
+       \r
     myfile = filp_open( dev->_audiofilename, O_RDONLY | O_LARGEFILE, 0 );\r
     \r
     \r
     if (IS_ERR(myfile)) \r
     {\r
-        const int open_errno = -PTR_ERR(myfile);\r
-        printk("%s(): ERROR opening file(%s) with errno = %d! \n", __func__, dev->_audiofilename, open_errno);\r
-        return PTR_ERR(myfile);\r
+       const int open_errno = -PTR_ERR(myfile);\r
+       printk("%s(): ERROR opening file(%s) with errno = %d! \n", __func__, dev->_audiofilename, open_errno);\r
+       return PTR_ERR(myfile);\r
     } \r
     else \r
     {   \r
-        if( !(myfile->f_op) )\r
-        {            \r
-            printk("%s: File has no file operations registered!\n", __func__);\r
-            filp_close(myfile, NULL);\r
-            return -EIO;\r
-        }\r
-        \r
-        \r
-        if( !myfile->f_op->read )       \r
-        {            \r
-            printk("%s: File has no READ operations registered! \n", __func__);\r
-            filp_close(myfile, NULL);\r
-            return -EIO;\r
-        }\r
-        \r
-        pos = myfile->f_pos;            \r
-        old_fs = get_fs();  \r
-        set_fs(KERNEL_DS);\r
-                \r
-              \r
-        for( i = 0; i < dev->_audio_lines_count; i++ )\r
-        {\r
-            pos = file_offset;    \r
-            \r
-            vfs_read_retval = vfs_read(myfile, mybuf, line_size, &pos);     \r
-            \r
-            \r
-            if( vfs_read_retval > 0 && vfs_read_retval == line_size && dev->_audiodata_buf_virt_addr != NULL )   \r
-            {\r
-                memcpy( (void*)(dev->_audiodata_buf_virt_addr+frame_offset/4), mybuf, vfs_read_retval);      \r
-            }            \r
-            \r
-            file_offset += vfs_read_retval;\r
-            frame_offset += vfs_read_retval;\r
-\r
-            if( vfs_read_retval < line_size )\r
-            {      \r
-                printk(KERN_INFO "Done: exit %s() since no more bytes to read from Audio file.\n", __func__ );\r
-                break;\r
-            }      \r
-        }\r
-        \r
-        if( i > 0 )         \r
-            dev->_audioframe_count++;           \r
-\r
-        dev->_audiofile_status = (vfs_read_retval == line_size) ? IN_PROGRESS : END_OF_FILE;      \r
-\r
-        \r
-        set_fs(old_fs);                 \r
-        filp_close(myfile, NULL);          \r
+       if( !(myfile->f_op) )\r
+       {            \r
+           printk("%s: File has no file operations registered!\n", __func__);\r
+           filp_close(myfile, NULL);\r
+           return -EIO;\r
+       }\r
+       \r
+       \r
+       if( !myfile->f_op->read )       \r
+       {            \r
+           printk("%s: File has no READ operations registered! \n", __func__);\r
+           filp_close(myfile, NULL);\r
+           return -EIO;\r
+       }\r
+       \r
+       pos = myfile->f_pos;            \r
+       old_fs = get_fs();  \r
+       set_fs(KERNEL_DS);\r
+               \r
+             \r
+       for( i = 0; i < dev->_audio_lines_count; i++ )\r
+       {\r
+           pos = file_offset;    \r
+           \r
+           vfs_read_retval = vfs_read(myfile, mybuf, line_size, &pos);     \r
+           \r
+           \r
+           if( vfs_read_retval > 0 && vfs_read_retval == line_size && dev->_audiodata_buf_virt_addr != NULL )   \r
+           {\r
+               memcpy( (void*)(dev->_audiodata_buf_virt_addr+frame_offset/4), mybuf, vfs_read_retval);      \r
+           }            \r
+           \r
+           file_offset += vfs_read_retval;\r
+           frame_offset += vfs_read_retval;\r
+\r
+           if( vfs_read_retval < line_size )\r
+           {      \r
+               printk(KERN_INFO "Done: exit %s() since no more bytes to read from Audio file.\n", __func__ );\r
+               break;\r
+           }      \r
+       }\r
+       \r
+       if( i > 0 )         \r
+           dev->_audioframe_count++;           \r
+\r
+       dev->_audiofile_status = (vfs_read_retval == line_size) ? IN_PROGRESS : END_OF_FILE;      \r
+\r
+       \r
+       set_fs(old_fs);                 \r
+       filp_close(myfile, NULL);          \r
     }\r
     \r
     return 0;\r
@@ -360,8 +360,8 @@ static void cx25821_audioups_handler(struct work_struct *work)
        \r
     if( !dev )\r
     {\r
-        printk("ERROR %s(): since container_of(work_struct) FAILED! \n", __func__ );\r
-        return;\r
+       printk("ERROR %s(): since container_of(work_struct) FAILED! \n", __func__ );\r
+       return;\r
     }\r
   \r
     cx25821_get_audio_data( dev, &dev->sram_channels[dev->_audio_upstream_channel_select] );\r
@@ -377,91 +377,91 @@ int cx25821_openfile_audio(struct cx25821_dev *dev, struct sram_channel *sram_ch
     loff_t pos;\r
     loff_t offset = (unsigned long)0;\r
     mm_segment_t old_fs;\r
-        \r
+       \r
 \r
     myfile = filp_open( dev->_audiofilename, O_RDONLY | O_LARGEFILE, 0 );\r
     \r
     \r
     if (IS_ERR(myfile)) \r
     {\r
-        const int open_errno = -PTR_ERR(myfile);\r
-        printk("%s(): ERROR opening file(%s) with errno = %d! \n", __func__, dev->_audiofilename, open_errno);\r
-        return PTR_ERR(myfile);\r
+       const int open_errno = -PTR_ERR(myfile);\r
+       printk("%s(): ERROR opening file(%s) with errno = %d! \n", __func__, dev->_audiofilename, open_errno);\r
+       return PTR_ERR(myfile);\r
     } \r
     else \r
     {\r
-        if( !(myfile->f_op) )\r
-        {            \r
-            printk("%s: File has no file operations registered! \n", __func__);\r
-            filp_close(myfile, NULL);\r
-            return -EIO;\r
-        }\r
-        \r
-        \r
-        if( !myfile->f_op->read )\r
-        {            \r
-            printk("%s: File has no READ operations registered! \n", __func__);\r
-            filp_close(myfile, NULL);\r
-            return -EIO;\r
-        }\r
-        \r
-        pos = myfile->f_pos;\r
-        old_fs = get_fs();  \r
-        set_fs(KERNEL_DS);\r
-                \r
-        \r
-        for( j = 0; j < NUM_AUDIO_FRAMES; j++ )       \r
-        {          \r
-            for( i = 0; i < dev->_audio_lines_count; i++ )\r
-            {\r
-                pos = offset;\r
-\r
-                vfs_read_retval = vfs_read(myfile, mybuf, line_size, &pos);                \r
-                \r
-                \r
-                if( vfs_read_retval > 0 && vfs_read_retval == line_size && dev->_audiodata_buf_virt_addr != NULL )   \r
-                { \r
-                    memcpy( (void*)(dev->_audiodata_buf_virt_addr+offset/4), mybuf, vfs_read_retval);   \r
-                }                \r
-                \r
-                offset += vfs_read_retval;\r
-\r
-                if( vfs_read_retval < line_size )\r
-                {      \r
-                    printk(KERN_INFO "Done: exit %s() since no more bytes to read from Audio file.\n", __func__ );\r
-                    break;\r
-                }      \r
-            }\r
-            \r
-            if( i > 0 )     \r
-            {\r
-                dev->_audioframe_count++;\r
-            }            \r
-            \r
-            if( vfs_read_retval < line_size )\r
-            {\r
-                break;\r
-            }            \r
-        }\r
-        \r
-        dev->_audiofile_status = (vfs_read_retval == line_size) ? IN_PROGRESS : END_OF_FILE;   \r
-            \r
-        set_fs(old_fs);        \r
-        myfile->f_pos = 0;\r
-        filp_close(myfile, NULL);         \r
+       if( !(myfile->f_op) )\r
+       {            \r
+           printk("%s: File has no file operations registered! \n", __func__);\r
+           filp_close(myfile, NULL);\r
+           return -EIO;\r
+       }\r
+       \r
+       \r
+       if( !myfile->f_op->read )\r
+       {            \r
+           printk("%s: File has no READ operations registered! \n", __func__);\r
+           filp_close(myfile, NULL);\r
+           return -EIO;\r
+       }\r
+       \r
+       pos = myfile->f_pos;\r
+       old_fs = get_fs();  \r
+       set_fs(KERNEL_DS);\r
+               \r
+       \r
+       for( j = 0; j < NUM_AUDIO_FRAMES; j++ )       \r
+       {          \r
+           for( i = 0; i < dev->_audio_lines_count; i++ )\r
+           {\r
+               pos = offset;\r
+\r
+               vfs_read_retval = vfs_read(myfile, mybuf, line_size, &pos);                \r
+               \r
+               \r
+               if( vfs_read_retval > 0 && vfs_read_retval == line_size && dev->_audiodata_buf_virt_addr != NULL )   \r
+               { \r
+                   memcpy( (void*)(dev->_audiodata_buf_virt_addr+offset/4), mybuf, vfs_read_retval);   \r
+               }                \r
+               \r
+               offset += vfs_read_retval;\r
+\r
+               if( vfs_read_retval < line_size )\r
+               {      \r
+                   printk(KERN_INFO "Done: exit %s() since no more bytes to read from Audio file.\n", __func__ );\r
+                   break;\r
+               }      \r
+           }\r
+           \r
+           if( i > 0 )     \r
+           {\r
+               dev->_audioframe_count++;\r
+           }            \r
+           \r
+           if( vfs_read_retval < line_size )\r
+           {\r
+               break;\r
+           }            \r
+       }\r
+       \r
+       dev->_audiofile_status = (vfs_read_retval == line_size) ? IN_PROGRESS : END_OF_FILE;   \r
+           \r
+       set_fs(old_fs);        \r
+       myfile->f_pos = 0;\r
+       filp_close(myfile, NULL);         \r
     }\r
     \r
     return 0;\r
 }\r
 \r
 static int cx25821_audio_upstream_buffer_prepare(struct cx25821_dev *dev,\r
-                                                            struct sram_channel *sram_ch,\r
-                                                 int bpl)\r
+                                                            struct sram_channel *sram_ch,\r
+                                                int bpl)\r
 {\r
        int ret = 0;\r
        dma_addr_t dma_addr;\r
        dma_addr_t data_dma_addr;       \r
-        \r
+       \r
 \r
     cx25821_free_memory_audio(dev);     \r
     \r
@@ -474,7 +474,7 @@ static int cx25821_audio_upstream_buffer_prepare(struct cx25821_dev *dev,
    \r
     if (!dev->_risc_virt_addr)\r
     {\r
-        printk("cx25821 ERROR: pci_alloc_consistent() FAILED to allocate memory for RISC program! Returning.\n");\r
+       printk("cx25821 ERROR: pci_alloc_consistent() FAILED to allocate memory for RISC program! Returning.\n");\r
                return -ENOMEM;\r
     }\r
   \r
@@ -489,7 +489,7 @@ static int cx25821_audio_upstream_buffer_prepare(struct cx25821_dev *dev,
        \r
     if (!dev->_audiodata_buf_virt_addr)\r
     {        \r
-        printk("cx25821 ERROR: pci_alloc_consistent() FAILED to allocate memory for data buffer! Returning. \n");\r
+       printk("cx25821 ERROR: pci_alloc_consistent() FAILED to allocate memory for data buffer! Returning. \n");\r
                return -ENOMEM;\r
     }\r
   \r
@@ -499,8 +499,8 @@ static int cx25821_audio_upstream_buffer_prepare(struct cx25821_dev *dev,
    \r
     ret = cx25821_openfile_audio(dev, sram_ch);     \r
     if( ret < 0 )\r
-        return ret;\r
-                                      \r
+       return ret;\r
+                                     \r
     \r
     //Creating RISC programs\r
     ret = cx25821_risc_buffer_upstream_audio(dev, dev->pci, bpl, dev->_audio_lines_count );                                \r
@@ -528,86 +528,86 @@ int cx25821_audio_upstream_irq(struct cx25821_dev *dev, int chan_num, u32 status
     if (status & FLD_AUD_SRC_RISCI1)      \r
     {\r
            //Get interrupt_index of the program that interrupted\r
-        u32 prog_cnt = cx_read( channel->gpcnt );\r
+       u32 prog_cnt = cx_read( channel->gpcnt );\r
     \r
-        //Since we've identified our IRQ, clear our bits from the interrupt mask and interrupt status registers\r
-        cx_write(channel->int_msk, 0);  \r
-        cx_write(channel->int_stat, cx_read(channel->int_stat) );\r
+       //Since we've identified our IRQ, clear our bits from the interrupt mask and interrupt status registers\r
+       cx_write(channel->int_msk, 0);  \r
+       cx_write(channel->int_stat, cx_read(channel->int_stat) );\r
     \r
                spin_lock(&dev->slock);     \r
-            \r
-             \r
-        while(prog_cnt != dev->_last_index_irq)\r
-        {            \r
-            //Update _last_index_irq\r
-            if(dev->_last_index_irq < (NUMBER_OF_PROGRAMS-1))\r
-            {\r
-                dev->_last_index_irq++;\r
-            }\r
-            else\r
-            {\r
-                dev->_last_index_irq = 0;\r
-            }\r
-\r
-            dev->_audioframe_index = dev->_last_index_irq;\r
-            \r
-            queue_work(dev->_irq_audio_queues, &dev->_audio_work_entry);        \r
-        }\r
-\r
-    \r
-        if ( dev->_is_first_audio_frame )\r
-        {\r
-            dev->_is_first_audio_frame = 0;           \r
-            \r
-            if( dev->_risc_virt_start_addr != NULL )\r
-            {\r
-                risc_phys_jump_addr = dev->_risc_phys_start_addr + RISC_SYNC_INSTRUCTION_SIZE + AUDIO_RISC_DMA_BUF_SIZE;        \r
-                \r
-                rp = cx25821_risc_field_upstream_audio(dev, dev->_risc_virt_start_addr+1, dev->_audiodata_buf_phys_addr, AUDIO_LINE_SIZE, FIFO_DISABLE);      \r
-\r
-                if( USE_RISC_NOOP_AUDIO )\r
-                {\r
-                    for( i = 0; i < NUM_NO_OPS; i++ )\r
-                    {\r
-                        *(rp++) = cpu_to_le32(RISC_NOOP);\r
-                    }\r
-                }\r
-        \r
-                // Jump to 2nd Audio Frame\r
-                *(rp++)  = cpu_to_le32(RISC_JUMP | RISC_IRQ1 | RISC_CNT_RESET);      \r
-                *(rp++)  = cpu_to_le32(risc_phys_jump_addr);            \r
-                *(rp++)  = cpu_to_le32(0); \r
-            }\r
-        }\r
-        \r
+           \r
+            \r
+       while(prog_cnt != dev->_last_index_irq)\r
+       {            \r
+           //Update _last_index_irq\r
+           if(dev->_last_index_irq < (NUMBER_OF_PROGRAMS-1))\r
+           {\r
+               dev->_last_index_irq++;\r
+           }\r
+           else\r
+           {\r
+               dev->_last_index_irq = 0;\r
+           }\r
+\r
+           dev->_audioframe_index = dev->_last_index_irq;\r
+           \r
+           queue_work(dev->_irq_audio_queues, &dev->_audio_work_entry);        \r
+       }\r
+\r
+    \r
+       if ( dev->_is_first_audio_frame )\r
+       {\r
+           dev->_is_first_audio_frame = 0;           \r
+           \r
+           if( dev->_risc_virt_start_addr != NULL )\r
+           {\r
+               risc_phys_jump_addr = dev->_risc_phys_start_addr + RISC_SYNC_INSTRUCTION_SIZE + AUDIO_RISC_DMA_BUF_SIZE;        \r
+               \r
+               rp = cx25821_risc_field_upstream_audio(dev, dev->_risc_virt_start_addr+1, dev->_audiodata_buf_phys_addr, AUDIO_LINE_SIZE, FIFO_DISABLE);      \r
+\r
+               if( USE_RISC_NOOP_AUDIO )\r
+               {\r
+                   for( i = 0; i < NUM_NO_OPS; i++ )\r
+                   {\r
+                       *(rp++) = cpu_to_le32(RISC_NOOP);\r
+                   }\r
+               }\r
+       \r
+               // Jump to 2nd Audio Frame\r
+               *(rp++)  = cpu_to_le32(RISC_JUMP | RISC_IRQ1 | RISC_CNT_RESET);      \r
+               *(rp++)  = cpu_to_le32(risc_phys_jump_addr);            \r
+               *(rp++)  = cpu_to_le32(0); \r
+           }\r
+       }\r
+       \r
                spin_unlock(&dev->slock);      \r
        }\r
     else\r
     {\r
-        if(status & FLD_AUD_SRC_OF)\r
-            printk("%s: Audio Received Overflow Error Interrupt!\n", __func__);\r
+       if(status & FLD_AUD_SRC_OF)\r
+           printk("%s: Audio Received Overflow Error Interrupt!\n", __func__);\r
 \r
-        if(status & FLD_AUD_SRC_SYNC)\r
-            printk("%s: Audio Received Sync Error Interrupt!\n", __func__);\r
+       if(status & FLD_AUD_SRC_SYNC)\r
+           printk("%s: Audio Received Sync Error Interrupt!\n", __func__);\r
 \r
-        if(status & FLD_AUD_SRC_OPC_ERR)\r
-            printk("%s: Audio Received OpCode Error Interrupt!\n", __func__);    \r
-            \r
-        // Read and write back the interrupt status register to clear our bits\r
-        cx_write(channel->int_stat, cx_read(channel->int_stat) );   \r
+       if(status & FLD_AUD_SRC_OPC_ERR)\r
+           printk("%s: Audio Received OpCode Error Interrupt!\n", __func__);    \r
+           \r
+       // Read and write back the interrupt status register to clear our bits\r
+       cx_write(channel->int_stat, cx_read(channel->int_stat) );   \r
     }\r
      \r
-        \r
+       \r
     if( dev->_audiofile_status == END_OF_FILE )\r
     {                       \r
-        printk("cx25821: EOF Channel Audio Framecount = %d\n", dev->_audioframe_count );\r
-        return -1;\r
+       printk("cx25821: EOF Channel Audio Framecount = %d\n", dev->_audioframe_count );\r
+       return -1;\r
     }\r
     \r
     //ElSE, set the interrupt mask register, re-enable irq. \r
     int_msk_tmp = cx_read( channel->int_msk );              \r
     cx_write( channel->int_msk, int_msk_tmp |= _intr_msk ); \r
-               \r
+              \r
     return 0;\r
 }\r
 \r
@@ -620,8 +620,8 @@ static irqreturn_t cx25821_upstream_irq_audio(int irq, void *dev_id)
     \r
     \r
     if( !dev )\r
-        return -1;\r
-        \r
+       return -1;\r
+       \r
 \r
     sram_ch = &dev->sram_channels[dev->_audio_upstream_channel_select];     \r
 \r
@@ -631,17 +631,17 @@ static irqreturn_t cx25821_upstream_irq_audio(int irq, void *dev_id)
     // Only deal with our interrupt\r
     if(audio_status)\r
     {\r
-        handled = cx25821_audio_upstream_irq(dev, dev->_audio_upstream_channel_select, audio_status);\r
+       handled = cx25821_audio_upstream_irq(dev, dev->_audio_upstream_channel_select, audio_status);\r
     }\r
     \r
     \r
     if( handled < 0 )\r
     {    \r
-        cx25821_stop_upstream_audio(dev);\r
+       cx25821_stop_upstream_audio(dev);\r
     }\r
     else\r
     {\r
-        handled += handled;    \r
+       handled += handled;    \r
     }   \r
 \r
        return IRQ_RETVAL(handled);\r
@@ -655,24 +655,24 @@ static void cx25821_wait_fifo_enable(struct cx25821_dev *dev, struct sram_channe
     \r
     do\r
     {\r
-        //Wait 10 microsecond before checking to see if the FIFO is turned ON.\r
-        udelay(10);\r
-\r
-        tmp = cx_read( sram_ch->dma_ctl );\r
-        \r
-        if(count++ > 1000) //10 millisecond timeout         \r
-        {\r
-            printk("cx25821 ERROR: %s() fifo is NOT turned on. Timeout!\n", __func__);\r
-            return;\r
-        }\r
-        \r
+       //Wait 10 microsecond before checking to see if the FIFO is turned ON.\r
+       udelay(10);\r
+\r
+       tmp = cx_read( sram_ch->dma_ctl );\r
+       \r
+       if(count++ > 1000) //10 millisecond timeout         \r
+       {\r
+           printk("cx25821 ERROR: %s() fifo is NOT turned on. Timeout!\n", __func__);\r
+           return;\r
+       }\r
+       \r
     } while( !(tmp & sram_ch->fld_aud_fifo_en) );\r
-            \r
+           \r
 }\r
 \r
 \r
 int cx25821_start_audio_dma_upstream(struct cx25821_dev *dev,\r
-                                                    struct sram_channel *sram_ch)\r
+                                                    struct sram_channel *sram_ch)\r
 {\r
     u32 tmp = 0;\r
     int err = 0;\r
@@ -744,10 +744,10 @@ int cx25821_audio_upstream_init(struct cx25821_dev *dev, int channel_select)
     \r
     if( dev->_audio_is_running )\r
     {\r
-        printk("Audio Channel is still running so return!\n");\r
-        return 0;\r
+       printk("Audio Channel is still running so return!\n");\r
+       return 0;\r
     }\r
-        \r
+       \r
     dev->_audio_upstream_channel_select = channel_select;      \r
     sram_ch = &dev->sram_channels[channel_select];   \r
     \r
@@ -757,10 +757,10 @@ int cx25821_audio_upstream_init(struct cx25821_dev *dev, int channel_select)
 \r
        if(!dev->_irq_audio_queues)\r
     {\r
-        printk("cx25821 ERROR: create_singlethread_workqueue() for Audio FAILED!\n");\r
+       printk("cx25821 ERROR: create_singlethread_workqueue() for Audio FAILED!\n");\r
                return -ENOMEM;\r
     }\r
-         \r
+        \r
     \r
     dev->_last_index_irq     = 0;        \r
     dev->_audio_is_running   = 0;    \r
@@ -769,32 +769,32 @@ int cx25821_audio_upstream_init(struct cx25821_dev *dev, int channel_select)
     dev->_audio_lines_count  = LINES_PER_AUDIO_BUFFER; \r
     _line_size          = AUDIO_LINE_SIZE; \r
 \r
-        \r
+       \r
     if( dev->input_audiofilename )\r
     {\r
-        str_length = strlen(dev->input_audiofilename);\r
-        dev->_audiofilename = (char *) kmalloc(str_length + 1, GFP_KERNEL);        \r
-        \r
-        if( !dev->_audiofilename )\r
-            goto error;\r
-            \r
-        memcpy(dev->_audiofilename, dev->input_audiofilename, str_length + 1);  \r
-\r
-        //Default if filename is empty string\r
-        if( strcmp(dev->input_audiofilename,"") == 0)        \r
-        {\r
-            dev->_audiofilename = "/root/audioGOOD.wav";    \r
-        }         \r
+       str_length = strlen(dev->input_audiofilename);\r
+       dev->_audiofilename = (char *) kmalloc(str_length + 1, GFP_KERNEL);        \r
+       \r
+       if( !dev->_audiofilename )\r
+           goto error;\r
+           \r
+       memcpy(dev->_audiofilename, dev->input_audiofilename, str_length + 1);  \r
+\r
+       //Default if filename is empty string\r
+       if( strcmp(dev->input_audiofilename,"") == 0)        \r
+       {\r
+           dev->_audiofilename = "/root/audioGOOD.wav";    \r
+       }         \r
     }\r
     else\r
     {\r
-        str_length = strlen(_defaultAudioName);       \r
-        dev->_audiofilename = (char *) kmalloc(str_length + 1, GFP_KERNEL);        \r
-        \r
-        if( !dev->_audiofilename )\r
-            goto error;\r
-            \r
-        memcpy(dev->_audiofilename, _defaultAudioName, str_length + 1);\r
+       str_length = strlen(_defaultAudioName);       \r
+       dev->_audiofilename = (char *) kmalloc(str_length + 1, GFP_KERNEL);        \r
+       \r
+       if( !dev->_audiofilename )\r
+           goto error;\r
+           \r
+       memcpy(dev->_audiofilename, _defaultAudioName, str_length + 1);\r
     }  \r
      \r
     \r
@@ -822,4 +822,3 @@ error:
     \r
     return err;\r
 }\r
-       

diff --cc drivers/staging/cx25821/cx25821-audups11.c
Simple merge

diff --cc drivers/staging/cx25821/cx25821-cards.c
Simple merge

diff --cc drivers/staging/cx25821/cx25821-core.c
Simple merge

diff --cc drivers/staging/cx25821/cx25821-gpio.c
Simple merge

diff --cc drivers/staging/cx25821/cx25821-i2c.c
Simple merge

diff --cc drivers/staging/cx25821/cx25821-medusa-video.c
Simple merge

diff --cc drivers/staging/cx25821/cx25821-medusa-video.h
Simple merge

diff --cc drivers/staging/cx25821/cx25821-reg.h
Simple merge

diff --cc drivers/staging/cx25821/cx25821-video-upstream-ch2.c
Simple merge

diff --cc drivers/staging/cx25821/cx25821-video-upstream-ch2.h
Simple merge

diff --cc drivers/staging/cx25821/cx25821-video-upstream.c
Simple merge

diff --cc drivers/staging/cx25821/cx25821-video-upstream.h
Simple merge

diff --cc drivers/staging/cx25821/cx25821-video.c
Simple merge

diff --cc drivers/staging/cx25821/cx25821-video.h
Simple merge

diff --cc drivers/staging/cx25821/cx25821-video0.c
Simple merge

diff --cc drivers/staging/cx25821/cx25821-video1.c
Simple merge

diff --cc drivers/staging/cx25821/cx25821-video2.c
Simple merge

diff --cc drivers/staging/cx25821/cx25821-video3.c
Simple merge

diff --cc drivers/staging/cx25821/cx25821-video4.c
Simple merge

diff --cc drivers/staging/cx25821/cx25821-video5.c
Simple merge

diff --cc drivers/staging/cx25821/cx25821-video6.c
Simple merge

diff --cc drivers/staging/cx25821/cx25821-video7.c
Simple merge

diff --cc drivers/staging/cx25821/cx25821-videoioctl.c
Simple merge

diff --cc drivers/staging/cx25821/cx25821-vidups10.c
Simple merge

diff --cc drivers/staging/cx25821/cx25821-vidups9.c
Simple merge

diff --cc drivers/staging/cx25821/cx25821.h
Simple merge