V4L/DVB (6162): cx23885: whitespace cleanups

Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

5 files changed, 211 insertions, 183 deletions

diff --git a/drivers/media/video/cx23885/cx23885-cards.c b/drivers/media/video/cx23885/cx23885-cards.c
index decf602ab164..8bb3fe4a876c 100644
--- a/drivers/media/video/cx23885/cx23885-cards.c
+++ b/drivers/media/video/cx23885/cx23885-cards.c
@@ -171,7 +171,8 @@ void cx23885_card_setup(struct cx23885_dev *dev)
 
         if (dev->i2c_bus[0].i2c_rc == 0) {
                 dev->i2c_bus[0].i2c_client.addr = 0xa0 >> 1;
-                tveeprom_read(&dev->i2c_bus[0].i2c_client, eeprom, sizeof(eeprom));
+                tveeprom_read(&dev->i2c_bus[0].i2c_client,
+                              eeprom, sizeof(eeprom));
         }
 
         switch (dev->board) {
diff --git a/drivers/media/video/cx23885/cx23885-core.c b/drivers/media/video/cx23885/cx23885-core.c
index 804ba7ff9770..6f0a8dbc6b3b 100644
--- a/drivers/media/video/cx23885/cx23885-core.c
+++ b/drivers/media/video/cx23885/cx23885-core.c
@@ -349,15 +349,15 @@ static int cx23885_risc_decode(u32 risc)
 
         printk("0x%08x [ %s", risc,
                instr[risc >> 28] ? instr[risc >> 28] : "INVALID");
-        for (i = ARRAY_SIZE(bits)-1; i >= 0; i--)
+        for (i = ARRAY_SIZE(bits) - 1; i >= 0; i--)
                 if (risc & (1 << (i + 12)))
-                        printk(" %s",bits[i]);
+                        printk(" %s", bits[i]);
         printk(" count=%d ]\n", risc & 0xfff);
         return incr[risc >> 28] ? incr[risc >> 28] : 1;
 }
 
 void cx23885_wakeup(struct cx23885_tsport *port,
-                 struct cx23885_dmaqueue *q, u32 count)
+                    struct cx23885_dmaqueue *q, u32 count)
 {
         struct cx23885_dev *dev = port->dev;
         struct cx23885_buffer *buf;
@@ -374,7 +374,7 @@ void cx23885_wakeup(struct cx23885_tsport *port,
                 if ((s16) (count - buf->count) < 0)
                         break;
                 do_gettimeofday(&buf->vb.ts);
-                dprintk(2,"[%p/%d] wakeup reg=%d buf=%d\n",buf,buf->vb.i,
+                dprintk(2, "[%p/%d] wakeup reg=%d buf=%d\n", buf, buf->vb.i,
                         count, buf->count);
                 buf->vb.state = STATE_DONE;
                 list_del(&buf->vb.queue);
@@ -383,31 +383,34 @@ void cx23885_wakeup(struct cx23885_tsport *port,
         if (list_empty(&q->active)) {
                 del_timer(&q->timeout);
         } else {
-                mod_timer(&q->timeout, jiffies+BUFFER_TIMEOUT);
+                mod_timer(&q->timeout, jiffies + BUFFER_TIMEOUT);
         }
         if (bc != 1)
-                printk("%s: %d buffers handled (should be 1)\n",__FUNCTION__,bc);
+                printk("%s: %d buffers handled (should be 1)\n",
+                       __FUNCTION__, bc);
 }
 void cx23885_sram_channel_dump(struct cx23885_dev *dev,
-                            struct sram_channel *ch);
+                               struct sram_channel *ch);
 
 int cx23885_sram_channel_setup(struct cx23885_dev *dev,
-                            struct sram_channel *ch,
-                            unsigned int bpl, u32 risc)
+                               struct sram_channel *ch,
+                               unsigned int bpl, u32 risc)
 {
-        unsigned int i,lines;
+        unsigned int i, lines;
         u32 cdt;
 
         if (ch->cmds_start == 0)
         {
-                dprintk(1, "%s() Erasing channel [%s]\n",__FUNCTION__, ch->name);
+                dprintk(1, "%s() Erasing channel [%s]\n", __FUNCTION__,
+                        ch->name);
                 cx_write(ch->ptr1_reg, 0);
                 cx_write(ch->ptr2_reg, 0);
                 cx_write(ch->cnt2_reg, 0);
                 cx_write(ch->cnt1_reg, 0);
                 return 0;
         } else {
-                dprintk(1, "%s() Configuring channel [%s]\n",__FUNCTION__, ch->name);
+                dprintk(1, "%s() Configuring channel [%s]\n", __FUNCTION__,
+                        ch->name);
         }
 
         bpl   = (bpl + 7) & ~7; /* alignment */
@@ -417,13 +420,14 @@ int cx23885_sram_channel_setup(struct cx23885_dev *dev,
                 lines = 6;
         BUG_ON(lines < 2);
 
-        cx_write(8+0, cpu_to_le32(RISC_JUMP | RISC_IRQ1 | RISC_CNT_INC) );
-        cx_write(8+4, cpu_to_le32(8) );
-        cx_write(8+8, cpu_to_le32(0) );
+        cx_write(8 + 0, cpu_to_le32(RISC_JUMP | RISC_IRQ1 | RISC_CNT_INC) );
+        cx_write(8 + 4, cpu_to_le32(8) );
+        cx_write(8 + 8, cpu_to_le32(0) );
 
         /* write CDT */
         for (i = 0; i < lines; i++) {
-                dprintk(2, "%s() 0x%08x <- 0x%08x\n", __FUNCTION__, cdt + 16*i, ch->fifo_start + bpl*i);
+                dprintk(2, "%s() 0x%08x <- 0x%08x\n", __FUNCTION__, cdt + 16*i,
+                        ch->fifo_start + bpl*i);
                 cx_write(cdt + 16*i, ch->fifo_start + bpl*i);
                 cx_write(cdt + 16*i +  4, 0);
                 cx_write(cdt + 16*i +  8, 0);
@@ -462,7 +466,7 @@ int cx23885_sram_channel_setup(struct cx23885_dev *dev,
 }
 
 void cx23885_sram_channel_dump(struct cx23885_dev *dev,
-                            struct sram_channel *ch)
+                               struct sram_channel *ch)
 {
         static char *name[] = {
                 "init risc lo",
@@ -481,7 +485,7 @@ void cx23885_sram_channel_dump(struct cx23885_dev *dev,
                 "line / byte",
         };
         u32 risc;
-        unsigned int i,j,n;
+        unsigned int i, j, n;
 
         printk("%s: %s - dma channel status dump\n",
                dev->name, ch->name);
@@ -491,16 +495,19 @@ void cx23885_sram_channel_dump(struct cx23885_dev *dev,
                        cx_read(ch->cmds_start + 4*i));
 
         for (i = 0; i < 4; i++) {
-                risc = cx_read(ch->cmds_start + 4 * (i+14));
+                risc = cx_read(ch->cmds_start + 4 * (i + 14));
                 printk("%s:   risc%d: ", dev->name, i);
                 cx23885_risc_decode(risc);
         }
         for (i = 0; i < (64 >> 2); i += n) {
-                risc = cx_read(ch->ctrl_start + 4 * i); /* No consideration for bits 63-32 */
-                printk("%s:   (0x%08x) iq %x: ", dev->name, ch->ctrl_start + 4 * i, i);
+                risc = cx_read(ch->ctrl_start + 4 * i);
+                /* No consideration for bits 63-32 */
+
+                printk("%s:   (0x%08x) iq %x: ", dev->name,
+                       ch->ctrl_start + 4 * i, i);
                 n = cx23885_risc_decode(risc);
                 for (j = 1; j < n; j++) {
-                        risc = cx_read(ch->ctrl_start + 4 * (i+j));
+                        risc = cx_read(ch->ctrl_start + 4 * (i + j));
                         printk("%s:   iq %x: 0x%08x [ arg #%d ]\n",
                                dev->name, i+j, risc, j);
                 }
@@ -509,7 +516,7 @@ void cx23885_sram_channel_dump(struct cx23885_dev *dev,
         printk("%s: fifo: 0x%08x -> 0x%x\n",
                dev->name, ch->fifo_start, ch->fifo_start+ch->fifo_size);
         printk("%s: ctrl: 0x%08x -> 0x%x\n",
-               dev->name, ch->ctrl_start, ch->ctrl_start+6*16);
+               dev->name, ch->ctrl_start, ch->ctrl_start + 6*16);
         printk("%s:   ptr1_reg: 0x%08x\n",
                dev->name, cx_read(ch->ptr1_reg));
         printk("%s:   ptr2_reg: 0x%08x\n",
@@ -520,10 +527,11 @@ void cx23885_sram_channel_dump(struct cx23885_dev *dev,
                dev->name, cx_read(ch->cnt2_reg));
 }
 
-void cx23885_risc_disasm(struct cx23885_tsport *port, struct btcx_riscmem *risc)
+void cx23885_risc_disasm(struct cx23885_tsport *port,
+                         struct btcx_riscmem *risc)
 {
         struct cx23885_dev *dev = port->dev;
-        unsigned int i,j,n;
+        unsigned int i, j, n;
 
         printk("%s: risc disasm: %p [dma=0x%08lx]\n",
                dev->name, risc->cpu, (unsigned long)risc->dma);
@@ -532,7 +540,7 @@ void cx23885_risc_disasm(struct cx23885_tsport *port, struct btcx_riscmem *risc)
                 n = cx23885_risc_decode(risc->cpu[i]);
                 for (j = 1; j < n; j++)
                         printk("%s:   %04d: 0x%08x [ arg #%d ]\n",
-                               dev->name, i+j, risc->cpu[i+j], j);
+                               dev->name, i + j, risc->cpu[i + j], j);
                 if (risc->cpu[i] == RISC_JUMP)
                         break;
         }
@@ -625,8 +633,8 @@ static int cx23885_pci_quirks(struct cx23885_dev *dev)
 static int get_resources(struct cx23885_dev *dev)
 {
         if (request_mem_region(pci_resource_start(dev->pci,0),
-                                pci_resource_len(dev->pci,0),
-                                dev->name))
+                               pci_resource_len(dev->pci,0),
+                               dev->name))
                 return 0;
 
         printk(KERN_ERR "%s: can't get MMIO memory @ 0x%llx\n",
@@ -637,7 +645,7 @@ static int get_resources(struct cx23885_dev *dev)
 
 static void cx23885_timeout(unsigned long data);
 int cx23885_risc_stopper(struct pci_dev *pci, struct btcx_riscmem *risc,
-                      u32 reg, u32 mask, u32 value);
+                         u32 reg, u32 mask, u32 value);
 
 static int cx23885_ir_init(struct cx23885_dev *dev)
 {
@@ -726,15 +734,16 @@ static int cx23885_dev_setup(struct cx23885_dev *dev)
         dev->ts2.gen_ctrl_val = 0xc; /* Serial bus + punctured clock */
         dev->ts2.ts_clk_en_val = 0x1; /* Enable TS_CLK */
 
-        cx23885_risc_stopper(dev->pci, &dev->ts2.mpegq.stopper, dev->ts2.reg_dma_ctl, dev->ts2.dma_ctl_val, 0x00);
+        cx23885_risc_stopper(dev->pci, &dev->ts2.mpegq.stopper,
+                             dev->ts2.reg_dma_ctl, dev->ts2.dma_ctl_val, 0x00);
 
-        sprintf(dev->name,"cx23885[%d]", dev->nr);
+        sprintf(dev->name, "cx23885[%d]", dev->nr);
 
         if (get_resources(dev) < 0) {
                 printk(KERN_ERR "CORE %s No more PCIe resources for "
-                        "subsystem: %04x:%04x\n",
-                        dev->name, dev->pci->subsystem_vendor,
-                        dev->pci->subsystem_device);
+                       "subsystem: %04x:%04x\n",
+                       dev->name, dev->pci->subsystem_vendor,
+                       dev->pci->subsystem_device);
 
                 cx23885_devcount--;
                 goto fail_free;
@@ -746,7 +755,7 @@ static int cx23885_dev_setup(struct cx23885_dev *dev)
 
         /* PCIe stuff */
         dev->lmmio = ioremap(pci_resource_start(dev->pci,0),
-                              pci_resource_len(dev->pci,0));
+                             pci_resource_len(dev->pci,0));
 
         dev->bmmio = (u8 __iomem *)dev->lmmio;
 
@@ -765,10 +774,10 @@ static int cx23885_dev_setup(struct cx23885_dev *dev)
                 cx23885_card_list(dev);
         }
         printk(KERN_INFO "CORE %s: subsystem: %04x:%04x, board: %s [card=%d,%s]\n",
-                dev->name, dev->pci->subsystem_vendor,
-                dev->pci->subsystem_device, cx23885_boards[dev->board].name,
-                dev->board, card[dev->nr] == dev->board ?
-                "insmod option" : "autodetected");
+               dev->name, dev->pci->subsystem_vendor,
+               dev->pci->subsystem_device, cx23885_boards[dev->board].name,
+               dev->board, card[dev->nr] == dev->board ?
+               "insmod option" : "autodetected");
 
         /* Configure the internal memory */
         if(dev->pci->device == 0x8880) {
@@ -779,7 +788,8 @@ static int cx23885_dev_setup(struct cx23885_dev *dev)
                 dev->bridge = CX23885_BRIDGE_885;
                 dev->sram_channels = cx23885_sram_channels;
         }
-        dprintk(1, "%s() Memory configured for PCIe bridge type %d\n", __FUNCTION__, dev->bridge);
+        dprintk(1, "%s() Memory configured for PCIe bridge type %d\n",
+                __FUNCTION__, dev->bridge);
 
         /* init hardware */
         cx23885_reset(dev);
@@ -793,7 +803,8 @@ static int cx23885_dev_setup(struct cx23885_dev *dev)
         cx23885_ir_init(dev);
 
         if (cx23885_dvb_register(&dev->ts2) < 0) {
-                printk(KERN_ERR "%s() Failed to register dvb adapters\n", __FUNCTION__);
+                printk(KERN_ERR "%s() Failed to register dvb adapters\n",
+                       __FUNCTION__);
         }
 
         return 0;
@@ -820,12 +831,12 @@ void cx23885_dev_unregister(struct cx23885_dev *dev)
 }
 
 static u32* cx23885_risc_field(u32 *rp, struct scatterlist *sglist,
-                            unsigned int offset, u32 sync_line,
-                            unsigned int bpl, unsigned int padding,
-                            unsigned int lines)
+                               unsigned int offset, u32 sync_line,
+                               unsigned int bpl, unsigned int padding,
+                               unsigned int lines)
 {
         struct scatterlist *sg;
-        unsigned int line,todo;
+        unsigned int line, todo;
 
         /* sync instruction */
         if (sync_line != NO_SYNC_LINE)
@@ -874,11 +885,11 @@ static u32* cx23885_risc_field(u32 *rp, struct scatterlist *sglist,
 }
 
 int cx23885_risc_buffer(struct pci_dev *pci, struct btcx_riscmem *risc,
-                     struct scatterlist *sglist,
-                     unsigned int top_offset, unsigned int bottom_offset,
-                     unsigned int bpl, unsigned int padding, unsigned int lines)
+                        struct scatterlist *sglist, unsigned int top_offset,
+                        unsigned int bottom_offset, unsigned int bpl,
+                        unsigned int padding, unsigned int lines)
 {
-        u32 instructions,fields;
+        u32 instructions, fields;
         u32 *rp;
         int rc;
 
@@ -903,10 +914,10 @@ int cx23885_risc_buffer(struct pci_dev *pci, struct btcx_riscmem *risc,
         rp = risc->cpu;
         if (UNSET != top_offset)
                 rp = cx23885_risc_field(rp, sglist, top_offset, 0,
-                                     bpl, padding, lines);
+                                        bpl, padding, lines);
         if (UNSET != bottom_offset)
                 rp = cx23885_risc_field(rp, sglist, bottom_offset, 0x200,
-                                     bpl, padding, lines);
+                                        bpl, padding, lines);
 
         /* save pointer to jmp instruction address */
         risc->jmp = rp;
@@ -915,8 +926,8 @@ int cx23885_risc_buffer(struct pci_dev *pci, struct btcx_riscmem *risc,
 }
 
 int cx23885_risc_databuffer(struct pci_dev *pci, struct btcx_riscmem *risc,
-                         struct scatterlist *sglist, unsigned int bpl,
-                         unsigned int lines)
+                            struct scatterlist *sglist, unsigned int bpl,
+                            unsigned int lines)
 {
         u32 instructions;
         u32 *rp;
@@ -945,7 +956,7 @@ int cx23885_risc_databuffer(struct pci_dev *pci, struct btcx_riscmem *risc,
 }
 
 int cx23885_risc_stopper(struct pci_dev *pci, struct btcx_riscmem *risc,
-                      u32 reg, u32 mask, u32 value)
+                         u32 reg, u32 mask, u32 value)
 {
         u32 *rp;
         int rc;
@@ -969,7 +980,7 @@ int cx23885_risc_stopper(struct pci_dev *pci, struct btcx_riscmem *risc,
 void cx23885_free_buffer(struct videobuf_queue *q, struct cx23885_buffer *buf)
 {
         BUG_ON(in_interrupt());
-        videobuf_waiton(&buf->vb,0,0);
+        videobuf_waiton(&buf->vb, 0, 0);
         videobuf_dma_unmap(q, &buf->vb.dma);
         videobuf_dma_free(&buf->vb.dma);
         btcx_riscmem_free((struct pci_dev *)q->dev, &buf->risc);
@@ -977,18 +988,18 @@ void cx23885_free_buffer(struct videobuf_queue *q, struct cx23885_buffer *buf)
 }
 
 static int cx23885_start_dma(struct cx23885_tsport *port,
-                            struct cx23885_dmaqueue *q,
-                            struct cx23885_buffer   *buf)
+                             struct cx23885_dmaqueue *q,
+                             struct cx23885_buffer   *buf)
 {
         struct cx23885_dev *dev = port->dev;
 
         dprintk(1, "%s() w: %d, h: %d, f: %d\n", __FUNCTION__,
-                        buf->vb.width, buf->vb.height, buf->vb.field);
+                buf->vb.width, buf->vb.height, buf->vb.field);
 
         /* setup fifo + format */
         cx23885_sram_channel_setup(dev,
-                &dev->sram_channels[ port->sram_chno ],
-                port->ts_packet_size, buf->risc.dma);
+                                   &dev->sram_channels[ port->sram_chno ],
+                                   port->ts_packet_size, buf->risc.dma);
         if(debug > 5) {
                 cx23885_sram_channel_dump(dev, &dev->sram_channels[ port->sram_chno ] );
                 cx23885_risc_disasm(port, &buf->risc);
@@ -998,8 +1009,8 @@ static int cx23885_start_dma(struct cx23885_tsport *port,
         cx_write(port->reg_lngth, buf->vb.width);
 
         if (!(cx23885_boards[dev->board].portc & CX23885_MPEG_DVB)) {
-                printk( "%s() Failed. Unsupported value in .portc (0x%08x)\n", __FUNCTION__,
-                        cx23885_boards[dev->board].portc );
+                printk( "%s() Failed. Unsupported value in .portc (0x%08x)\n",
+                        __FUNCTION__, cx23885_boards[dev->board].portc );
                 return -EINVAL;
         }
 
@@ -1017,7 +1028,8 @@ static int cx23885_start_dma(struct cx23885_tsport *port,
         case CX23885_BOARD_HAUPPAUGE_HVR1800lp:
         case CX23885_BOARD_HAUPPAUGE_HVR1800:
                 cx_write(port->reg_vld_misc, 0x00);
-                dprintk(1, "%s() Configuring HVR1800/lp/1500 board\n", __FUNCTION__);
+                dprintk(1, "%s() Configuring HVR1800/lp/1500 board\n",
+                        __FUNCTION__);
                 break;
         default:
                 // FIXME
@@ -1103,53 +1115,54 @@ static int cx23885_restart_queue(struct cx23885_tsport *port,
         dprintk(5, "%s()\n", __FUNCTION__);
         if (list_empty(&q->active))
         {
-               struct cx23885_buffer *prev;
-               prev = NULL;
+                struct cx23885_buffer *prev;
+                prev = NULL;
 
                 dprintk(5, "%s() queue is empty\n", __FUNCTION__);
 
-               for (;;) {
-                       if (list_empty(&q->queued))
-                               return 0;
-                       buf = list_entry(q->queued.next, struct cx23885_buffer, vb.queue);
-                       if (NULL == prev) {
-                               list_del(&buf->vb.queue);
-                               list_add_tail(&buf->vb.queue,&q->active);
-                               cx23885_start_dma(port, q, buf);
-                               buf->vb.state = STATE_ACTIVE;
-                               buf->count    = q->count++;
-                               mod_timer(&q->timeout, jiffies+BUFFER_TIMEOUT);
-                               dprintk(5,"[%p/%d] restart_queue - first active\n",
-                                       buf,buf->vb.i);
-
-                       } else if (prev->vb.width  == buf->vb.width  &&
-                                  prev->vb.height == buf->vb.height &&
-                                  prev->fmt       == buf->fmt) {
-                               list_del(&buf->vb.queue);
-                               list_add_tail(&buf->vb.queue,&q->active);
-                               buf->vb.state = STATE_ACTIVE;
-                               buf->count    = q->count++;
-                               prev->risc.jmp[1] = cpu_to_le32(buf->risc.dma);
-                               prev->risc.jmp[2] = cpu_to_le32(0); /* 64 bit bits 63-32 */
-                               dprintk(5,"[%p/%d] restart_queue - move to active\n",
-                                       buf,buf->vb.i);
-                       } else {
-                               return 0;
-                       }
-                       prev = buf;
-               }
+                for (;;) {
+                        if (list_empty(&q->queued))
+                                return 0;
+                        buf = list_entry(q->queued.next, struct cx23885_buffer,
+                                         vb.queue);
+                        if (NULL == prev) {
+                                list_del(&buf->vb.queue);
+                                list_add_tail(&buf->vb.queue, &q->active);
+                                cx23885_start_dma(port, q, buf);
+                                buf->vb.state = STATE_ACTIVE;
+                                buf->count    = q->count++;
+                                mod_timer(&q->timeout, jiffies+BUFFER_TIMEOUT);
+                                dprintk(5, "[%p/%d] restart_queue - first active\n",
+                                        buf, buf->vb.i);
+
+                        } else if (prev->vb.width  == buf->vb.width  &&
+                                   prev->vb.height == buf->vb.height &&
+                                   prev->fmt       == buf->fmt) {
+                                list_del(&buf->vb.queue);
+                                list_add_tail(&buf->vb.queue, &q->active);
+                                buf->vb.state = STATE_ACTIVE;
+                                buf->count    = q->count++;
+                                prev->risc.jmp[1] = cpu_to_le32(buf->risc.dma);
+                                prev->risc.jmp[2] = cpu_to_le32(0); /* 64 bit bits 63-32 */
+                                dprintk(5,"[%p/%d] restart_queue - move to active\n",
+                                        buf, buf->vb.i);
+                        } else {
+                                return 0;
+                        }
+                        prev = buf;
+                }
                 return 0;
         }
 
         buf = list_entry(q->active.next, struct cx23885_buffer, vb.queue);
-        dprintk(2,"restart_queue [%p/%d]: restart dma\n",
+        dprintk(2, "restart_queue [%p/%d]: restart dma\n",
                 buf, buf->vb.i);
         cx23885_start_dma(port, q, buf);
-        list_for_each(item,&q->active) {
+        list_for_each(item, &q->active) {
                 buf = list_entry(item, struct cx23885_buffer, vb.queue);
                 buf->count = q->count++;
         }
-        mod_timer(&q->timeout, jiffies+BUFFER_TIMEOUT);
+        mod_timer(&q->timeout, jiffies + BUFFER_TIMEOUT);
         return 0;
 }
 
@@ -1172,7 +1185,7 @@ int cx23885_buf_prepare(struct videobuf_queue *q, struct cx23885_tsport *port,
                 buf->vb.size   = size;
                 buf->vb.field  = field /*V4L2_FIELD_TOP*/;
 
-                if (0 != (rc = videobuf_iolock(q,&buf->vb,NULL)))
+                if (0 != (rc = videobuf_iolock(q, &buf->vb, NULL)))
                         goto fail;
                 cx23885_risc_databuffer(dev->pci, &buf->risc,
                                      buf->vb.dma.sglist,
@@ -1182,7 +1195,7 @@ int cx23885_buf_prepare(struct videobuf_queue *q, struct cx23885_tsport *port,
         return 0;
 
  fail:
-        cx23885_free_buffer(q,buf);
+        cx23885_free_buffer(q, buf);
         return rc;
 }
 
@@ -1199,51 +1212,53 @@ void cx23885_buf_queue(struct cx23885_tsport *port, struct cx23885_buffer *buf)
 
         if (list_empty(&cx88q->active)) {
                 dprintk( 1, "queue is empty - first active\n" );
-                list_add_tail(&buf->vb.queue,&cx88q->active);
+                list_add_tail(&buf->vb.queue, &cx88q->active);
                 cx23885_start_dma(port, cx88q, buf);
                 buf->vb.state = STATE_ACTIVE;
                 buf->count    = cx88q->count++;
-                mod_timer(&cx88q->timeout, jiffies+BUFFER_TIMEOUT);
-                dprintk(1,"[%p/%d] %s - first active\n",
+                mod_timer(&cx88q->timeout, jiffies + BUFFER_TIMEOUT);
+                dprintk(1, "[%p/%d] %s - first active\n",
                         buf, buf->vb.i, __FUNCTION__);
 
         } else {
                 dprintk( 1, "queue is not empty - append to active\n" );
-                prev = list_entry(cx88q->active.prev, struct cx23885_buffer, vb.queue);
-                list_add_tail(&buf->vb.queue,&cx88q->active);
+                prev = list_entry(cx88q->active.prev, struct cx23885_buffer,
+                                  vb.queue);
+                list_add_tail(&buf->vb.queue, &cx88q->active);
                 buf->vb.state = STATE_ACTIVE;
                 buf->count    = cx88q->count++;
                 prev->risc.jmp[1] = cpu_to_le32(buf->risc.dma);
                 prev->risc.jmp[2] = cpu_to_le32(0); /* 64 bit bits 63-32 */
                 dprintk( 1, "[%p/%d] %s - append to active\n",
-                        buf, buf->vb.i, __FUNCTION__);
+                         buf, buf->vb.i, __FUNCTION__);
         }
 }
 
 /* ----------------------------------------------------------- */
 
-static void do_cancel_buffers(struct cx23885_tsport *port, char *reason, int restart)
+static void do_cancel_buffers(struct cx23885_tsport *port, char *reason,
+                              int restart)
 {
         struct cx23885_dev *dev = port->dev;
         struct cx23885_dmaqueue *q = &port->mpegq;
         struct cx23885_buffer *buf;
         unsigned long flags;
 
-        spin_lock_irqsave(&port->slock,flags);
+        spin_lock_irqsave(&port->slock, flags);
         while (!list_empty(&q->active)) {
-                buf = list_entry(q->active.next, struct cx23885_buffer, vb.queue);
+                buf = list_entry(q->active.next, struct cx23885_buffer,
+                                 vb.queue);
                 list_del(&buf->vb.queue);
                 buf->vb.state = STATE_ERROR;
                 wake_up(&buf->vb.done);
-                dprintk(1,"[%p/%d] %s - dma=0x%08lx\n",
+                dprintk(1, "[%p/%d] %s - dma=0x%08lx\n",
                         buf, buf->vb.i, reason, (unsigned long)buf->risc.dma);
         }
-        if (restart)
-        {
+        if (restart) {
                 dprintk(1, "restarting queue\n" );
                 cx23885_restart_queue(port, q);
         }
-        spin_unlock_irqrestore(&port->slock,flags);
+        spin_unlock_irqrestore(&port->slock, flags);
 }
 
 void cx23885_cancel_buffers(struct cx23885_tsport *port)
@@ -1251,7 +1266,7 @@ void cx23885_cancel_buffers(struct cx23885_tsport *port)
         struct cx23885_dev *dev = port->dev;
         struct cx23885_dmaqueue *q = &port->mpegq;
 
-        dprintk(1, "%s()\n", __FUNCTION__ );
+        dprintk(1, "%s()\n", __FUNCTION__);
         del_timer_sync(&q->timeout);
         cx23885_stop_dma(port);
         do_cancel_buffers(port, "cancel", 0);
@@ -1312,15 +1327,15 @@ static irqreturn_t cx23885_irq(int irq, void *dev_id)
         dprintk(7, "ts2_status: 0x%08x  ts2_mask: 0x%08x count: 0x%x\n", ts2_status, ts2_mask, count );
 
         if ( (pci_status & PCI_MSK_RISC_RD) ||
-                (pci_status & PCI_MSK_RISC_WR) ||
-                (pci_status & PCI_MSK_AL_RD) ||
-                (pci_status & PCI_MSK_AL_WR) ||
-                (pci_status & PCI_MSK_APB_DMA) ||
-                (pci_status & PCI_MSK_VID_C) ||
-                (pci_status & PCI_MSK_VID_B) ||
-                (pci_status & PCI_MSK_VID_A) ||
-                (pci_status & PCI_MSK_AUD_INT) ||
-                (pci_status & PCI_MSK_AUD_EXT) )
+             (pci_status & PCI_MSK_RISC_WR) ||
+             (pci_status & PCI_MSK_AL_RD) ||
+             (pci_status & PCI_MSK_AL_WR) ||
+             (pci_status & PCI_MSK_APB_DMA) ||
+             (pci_status & PCI_MSK_VID_C) ||
+             (pci_status & PCI_MSK_VID_B) ||
+             (pci_status & PCI_MSK_VID_A) ||
+             (pci_status & PCI_MSK_AUD_INT) ||
+             (pci_status & PCI_MSK_AUD_EXT) )
         {
 
                 if (pci_status & PCI_MSK_RISC_RD)
@@ -1347,9 +1362,9 @@ static irqreturn_t cx23885_irq(int irq, void *dev_id)
         }
 
         if ( (ts2_status & VID_C_MSK_OPC_ERR) ||
-                (ts2_status & VID_C_MSK_BAD_PKT) ||
-                (ts2_status & VID_C_MSK_SYNC) ||
-                (ts2_status & VID_C_MSK_OF))
+             (ts2_status & VID_C_MSK_BAD_PKT) ||
+             (ts2_status & VID_C_MSK_SYNC) ||
+             (ts2_status & VID_C_MSK_OF))
         {
                 if (ts2_status & VID_C_MSK_OPC_ERR)
                         dprintk(7, " (VID_C_MSK_OPC_ERR 0x%08x)\n", VID_C_MSK_OPC_ERR);
@@ -1392,12 +1407,12 @@ out:
 }
 
 static int __devinit cx23885_initdev(struct pci_dev *pci_dev,
-                                    const struct pci_device_id *pci_id)
+                                     const struct pci_device_id *pci_id)
 {
         struct cx23885_dev *dev;
         int err;
 
-        dev = kzalloc(sizeof(*dev),GFP_KERNEL);
+        dev = kzalloc(sizeof(*dev), GFP_KERNEL);
         if (NULL == dev)
                 return -ENOMEM;
 
@@ -1428,8 +1443,8 @@ static int __devinit cx23885_initdev(struct pci_dev *pci_dev,
                 goto fail_irq;
         }
 
-        err = request_irq(pci_dev->irq, cx23885_irq
-                        , IRQF_SHARED | IRQF_DISABLED, dev->name, dev);
+        err = request_irq(pci_dev->irq, cx23885_irq,
+                          IRQF_SHARED | IRQF_DISABLED, dev->name, dev);
         if (err < 0) {
                 printk(KERN_ERR "%s: can't get IRQ %d\n",
                        dev->name, pci_dev->irq);
diff --git a/drivers/media/video/cx23885/cx23885-dvb.c b/drivers/media/video/cx23885/cx23885-dvb.c
index 79948553901d..bd0afc2a0447 100644
--- a/drivers/media/video/cx23885/cx23885-dvb.c
+++ b/drivers/media/video/cx23885/cx23885-dvb.c
@@ -53,11 +53,11 @@ static int dvb_buf_setup(struct videobuf_queue *q,
         return 0;
 }
 
-static int dvb_buf_prepare(struct videobuf_queue *q, struct videobuf_buffer *vb,
-                           enum v4l2_field field)
+static int dvb_buf_prepare(struct videobuf_queue *q,
+                           struct videobuf_buffer *vb, enum v4l2_field field)
 {
         struct cx23885_tsport *port = q->priv_data;
-        return cx23885_buf_prepare(q, port, (struct cx23885_buffer*)vb,field);
+        return cx23885_buf_prepare(q, port, (struct cx23885_buffer*)vb, field);
 }
 
 static void dvb_buf_queue(struct videobuf_queue *q, struct videobuf_buffer *vb)
@@ -66,7 +66,8 @@ static void dvb_buf_queue(struct videobuf_queue *q, struct videobuf_buffer *vb)
         cx23885_buf_queue(port, (struct cx23885_buffer*)vb);
 }
 
-static void dvb_buf_release(struct videobuf_queue *q, struct videobuf_buffer *vb)
+static void dvb_buf_release(struct videobuf_queue *q,
+                            struct videobuf_buffer *vb)
 {
         cx23885_free_buffer(q, (struct cx23885_buffer*)vb);
 }
@@ -116,26 +117,22 @@ static int dvb_register(struct cx23885_tsport *port)
         switch (dev->board) {
         case CX23885_BOARD_HAUPPAUGE_HVR1800lp:
                 port->dvb.frontend = dvb_attach(s5h1409_attach,
-                                               &hauppauge_hvr1800lp_config,
-                                               &dev->i2c_bus[0].i2c_adap);
+                                                &hauppauge_hvr1800lp_config,
+                                                &dev->i2c_bus[0].i2c_adap);
                 if (port->dvb.frontend != NULL) {
-                        dvb_attach(mt2131_attach,
-                                port->dvb.frontend,
-                                &dev->i2c_bus[0].i2c_adap,
-                                &hauppauge_hvr1800lp_rev2_tunerconfig,
-                                0);
+                        dvb_attach(mt2131_attach, port->dvb.frontend,
+                                   &dev->i2c_bus[0].i2c_adap,
+                                   &hauppauge_hvr1800lp_rev2_tunerconfig, 0);
                 }
                 break;
         case CX23885_BOARD_HAUPPAUGE_HVR1800:
                 port->dvb.frontend = dvb_attach(s5h1409_attach,
-                                               &hauppauge_hvr1800_config,
-                                               &dev->i2c_bus[0].i2c_adap);
+                                                &hauppauge_hvr1800_config,
+                                                &dev->i2c_bus[0].i2c_adap);
                 if (port->dvb.frontend != NULL) {
-                        dvb_attach(mt2131_attach,
-                                port->dvb.frontend,
-                                &dev->i2c_bus[0].i2c_adap,
-                                &hauppauge_hvr1800_tunerconfig,
-                                0);
+                        dvb_attach(mt2131_attach, port->dvb.frontend,
+                                   &dev->i2c_bus[0].i2c_adap,
+                                   &hauppauge_hvr1800_tunerconfig, 0);
                 }
                 break;
         default:
@@ -152,7 +149,8 @@ static int dvb_register(struct cx23885_tsport *port)
         cx23885_call_i2c_clients (&dev->i2c_bus[0], TUNER_SET_STANDBY, NULL);
 
         /* register everything */
-        return videobuf_dvb_register(&port->dvb, THIS_MODULE, port, &dev->pci->dev);
+        return videobuf_dvb_register(&port->dvb, THIS_MODULE, port,
+                                     &dev->pci->dev);
 }
 
 int cx23885_dvb_register(struct cx23885_tsport *port)
@@ -160,8 +158,8 @@ int cx23885_dvb_register(struct cx23885_tsport *port)
         struct cx23885_dev *dev = port->dev;
         int err;
 
-        dprintk( 1, "%s\n", __FUNCTION__);
-        dprintk( 1, " ->being probed by Card=%d Name=%s, PCI %02x:%02x\n",
+        dprintk(1, "%s\n", __FUNCTION__);
+        dprintk(1, " ->being probed by Card=%d Name=%s, PCI %02x:%02x\n",
                 dev->board,
                 dev->name,
                 dev->pci_bus,
@@ -173,15 +171,9 @@ int cx23885_dvb_register(struct cx23885_tsport *port)
 
         /* dvb stuff */
         printk("%s: cx23885 based dvb card\n", dev->name);
-        videobuf_queue_init(
-                &port->dvb.dvbq,
-                &dvb_qops,
-                dev->pci,
-                &port->slock,
-                V4L2_BUF_TYPE_VIDEO_CAPTURE,
-                V4L2_FIELD_TOP,
-                sizeof(struct cx23885_buffer),
-                port);
+        videobuf_queue_init(&port->dvb.dvbq, &dvb_qops, dev->pci, &port->slock,
+                            V4L2_BUF_TYPE_VIDEO_CAPTURE, V4L2_FIELD_TOP,
+                            sizeof(struct cx23885_buffer), port);
         err = dvb_register(port);
         if (err != 0)
                 printk("%s() dvb_register failed err = %d\n", __FUNCTION__, err);
@@ -198,3 +190,10 @@ int cx23885_dvb_unregister(struct cx23885_tsport *port)
 
         return 0;
 }
+
+/*
+ * Local variables:
+ * c-basic-offset: 8
+ * End:
+ * kate: eol "unix"; indent-width 3; remove-trailing-space on; replace-trailing-space-save on; tab-width 8; replace-tabs off; space-indent off; mixed-indent off
+*/
diff --git a/drivers/media/video/cx23885/cx23885-i2c.c b/drivers/media/video/cx23885/cx23885-i2c.c
index dbd048d08dda..155ab928cd60 100644
--- a/drivers/media/video/cx23885/cx23885-i2c.c
+++ b/drivers/media/video/cx23885/cx23885-i2c.c
@@ -31,11 +31,11 @@
 
 static unsigned int i2c_debug = 2;
 module_param(i2c_debug, int, 0644);
-MODULE_PARM_DESC(i2c_debug,"enable debug messages [i2c]");
+MODULE_PARM_DESC(i2c_debug, "enable debug messages [i2c]");
 
 static unsigned int i2c_scan = 0;
 module_param(i2c_scan, int, 0444);
-MODULE_PARM_DESC(i2c_scan,"scan i2c bus at insmod time");
+MODULE_PARM_DESC(i2c_scan, "scan i2c bus at insmod time");
 
 #define dprintk(level,fmt, arg...)      if (i2c_debug >= level) \
         printk(KERN_DEBUG "%s: " fmt, dev->name , ## arg)
@@ -76,7 +76,8 @@ static int i2c_wait_done(struct i2c_adapter *i2c_adap)
         return 1;
 }
 
-static int i2c_sendbytes(struct i2c_adapter *i2c_adap, const struct i2c_msg *msg, int last)
+static int i2c_sendbytes(struct i2c_adapter *i2c_adap,
+                         const struct i2c_msg *msg, int last)
 {
         struct cx23885_i2c *bus = i2c_adap->algo_data;
         struct cx23885_dev *dev = bus->dev;
@@ -150,11 +151,12 @@ static int i2c_sendbytes(struct i2c_adapter *i2c_adap, const struct i2c_msg *msg
  eio:
         retval = -EIO;
  err:
-        printk(" ERR: %d\n",retval);
+        printk(" ERR: %d\n", retval);
         return retval;
 }
 
-static int i2c_readbytes(struct i2c_adapter *i2c_adap, const struct i2c_msg *msg, int last)
+static int i2c_readbytes(struct i2c_adapter *i2c_adap,
+                         const struct i2c_msg *msg, int last)
 {
         struct cx23885_i2c *bus = i2c_adap->algo_data;
         struct cx23885_dev *dev = bus->dev;
@@ -206,11 +208,12 @@ static int i2c_readbytes(struct i2c_adapter *i2c_adap, const struct i2c_msg *msg
  eio:
         retval = -EIO;
  err:
-        printk(" ERR: %d\n",retval);
+        printk(" ERR: %d\n", retval);
         return retval;
 }
 
-static int i2c_xfer(struct i2c_adapter *i2c_adap, struct i2c_msg *msgs, int num)
+static int i2c_xfer(struct i2c_adapter *i2c_adap,
+                    struct i2c_msg *msgs, int num)
 {
         struct cx23885_i2c *bus = i2c_adap->algo_data;
         struct cx23885_dev *dev = bus->dev;
@@ -219,8 +222,8 @@ static int i2c_xfer(struct i2c_adapter *i2c_adap, struct i2c_msg *msgs, int num)
         dprintk(1, "%s(num = %d)\n", __FUNCTION__, num);
 
         for (i = 0 ; i < num; i++) {
-                dprintk(1, "%s(num = %d) addr = 0x%02x  len = 0x%x\n"
-                        , __FUNCTION__, num, msgs[i].addr, msgs[i].len);
+                dprintk(1, "%s(num = %d) addr = 0x%02x  len = 0x%x\n",
+                        __FUNCTION__, num, msgs[i].addr, msgs[i].len);
                 if (msgs[i].flags & I2C_M_RD) {
                         /* read */
                         retval = i2c_readbytes(i2c_adap, &msgs[i], i+1 == num);
@@ -261,7 +264,8 @@ static int detach_inform(struct i2c_client *client)
         return 0;
 }
 
-void cx23885_call_i2c_clients(struct cx23885_i2c *bus, unsigned int cmd, void *arg)
+void cx23885_call_i2c_clients(struct cx23885_i2c *bus,
+                              unsigned int cmd, void *arg)
 {
 //      struct cx23885_dev *dev = bus->dev;
 
@@ -316,11 +320,11 @@ static char *i2c_devs[128] = {
 static void do_i2c_scan(char *name, struct i2c_client *c)
 {
         unsigned char buf;
-        int i,rc;
+        int i, rc;
 
         for (i = 0; i < 128; i++) {
                 c->addr = i;
-                rc = i2c_master_recv(c,&buf,0);
+                rc = i2c_master_recv(c, &buf, 0);
                 if (rc < 0)
                         continue;
                 printk("%s: i2c scan: found device @ 0x%x  [%s]\n",
@@ -335,13 +339,17 @@ int cx23885_i2c_register(struct cx23885_i2c *bus)
 
         dprintk(1, "%s(bus = %d)\n", __FUNCTION__, bus->nr);
 
-        memcpy(&bus->i2c_adap, &cx23885_i2c_adap_template, sizeof(bus->i2c_adap));
-        memcpy(&bus->i2c_algo, &cx23885_i2c_algo_template, sizeof(bus->i2c_algo));
-        memcpy(&bus->i2c_client, &cx23885_i2c_client_template, sizeof(bus->i2c_client));
+        memcpy(&bus->i2c_adap, &cx23885_i2c_adap_template,
+               sizeof(bus->i2c_adap));
+        memcpy(&bus->i2c_algo, &cx23885_i2c_algo_template,
+               sizeof(bus->i2c_algo));
+        memcpy(&bus->i2c_client, &cx23885_i2c_client_template,
+               sizeof(bus->i2c_client));
 
         bus->i2c_adap.dev.parent = &dev->pci->dev;
 
-        strlcpy(bus->i2c_adap.name, bus->dev->name, sizeof(bus->i2c_adap.name));
+        strlcpy(bus->i2c_adap.name, bus->dev->name,
+                sizeof(bus->i2c_adap.name));
         bus->i2c_algo.data = bus;
         bus->i2c_adap.algo_data = bus;
         i2c_add_adapter(&bus->i2c_adap);
diff --git a/drivers/media/video/cx23885/cx23885.h b/drivers/media/video/cx23885/cx23885.h
index b60de21c2387..4312c3fcc1ec 100644
--- a/drivers/media/video/cx23885/cx23885.h
+++ b/drivers/media/video/cx23885/cx23885.h
@@ -183,7 +183,7 @@ struct cx23885_dev {
         //u32                        shadow[SHADOW_MAX];
         int                        pci_irqmask;
 
-        /* I2C adapters: Master 1 and 2 (External) and Master 3 (Internal only) */
+        /* I2C adapters: Master 1 & 2 (External) & Master 3 (Internal only) */
         struct cx23885_i2c         i2c_bus[3];
 
         int                        nr;
@@ -268,17 +268,22 @@ extern void cx23885_card_setup_pre_i2c(struct cx23885_dev *dev);
 extern int cx23885_dvb_register(struct cx23885_tsport *port);
 extern int cx23885_dvb_unregister(struct cx23885_tsport *port);
 
-extern int cx23885_buf_prepare(struct videobuf_queue *q, struct cx23885_tsport *port,
-                        struct cx23885_buffer *buf, enum v4l2_field field);
+extern int cx23885_buf_prepare(struct videobuf_queue *q,
+                               struct cx23885_tsport *port,
+                               struct cx23885_buffer *buf,
+                               enum v4l2_field field);
 
-extern void cx23885_buf_queue(struct cx23885_tsport *port, struct cx23885_buffer *buf);
-extern void cx23885_free_buffer(struct videobuf_queue *q, struct cx23885_buffer *buf);
+extern void cx23885_buf_queue(struct cx23885_tsport *port,
+                              struct cx23885_buffer *buf);
+extern void cx23885_free_buffer(struct videobuf_queue *q,
+                                struct cx23885_buffer *buf);
 
 /* ----------------------------------------------------------- */
 /* cx23885-i2c.c                                                */
 extern int cx23885_i2c_register(struct cx23885_i2c *bus);
 extern int cx23885_i2c_unregister(struct cx23885_i2c *bus);
-extern void cx23885_call_i2c_clients(struct cx23885_i2c *bus, unsigned int cmd, void *arg);
+extern void cx23885_call_i2c_clients(struct cx23885_i2c *bus, unsigned int cmd,
+                                     void *arg);
 
 /*
  * Local variables: