]> pilppa.org Git - linux-2.6-omap-h63xx.git/blobdiff - drivers/media/video/cx23885/cx23885-core.c
Merge branch 'for-rmk' of git://git.marvell.com/orion into devel
[linux-2.6-omap-h63xx.git] / drivers / media / video / cx23885 / cx23885-core.c
index beb3e61669a3373af706781717081aedf4dfa489..8f6fb2add7dea0c895c030597c0a5b9757c2155f 100644 (file)
@@ -37,12 +37,12 @@ MODULE_AUTHOR("Steven Toth <stoth@linuxtv.org>");
 MODULE_LICENSE("GPL");
 
 static unsigned int debug;
-module_param(debug,int,0644);
-MODULE_PARM_DESC(debug,"enable debug messages");
+module_param(debug, int, 0644);
+MODULE_PARM_DESC(debug, "enable debug messages");
 
 static unsigned int card[]  = {[0 ... (CX23885_MAXBOARDS - 1)] = UNSET };
 module_param_array(card,  int, NULL, 0444);
-MODULE_PARM_DESC(card,"card type");
+MODULE_PARM_DESC(card, "card type");
 
 #define dprintk(level, fmt, arg...)\
        do { if (debug >= level)\
@@ -364,13 +364,12 @@ void cx23885_wakeup(struct cx23885_tsport *port,
                list_del(&buf->vb.queue);
                wake_up(&buf->vb.done);
        }
-       if (list_empty(&q->active)) {
+       if (list_empty(&q->active))
                del_timer(&q->timeout);
-       } else {
+       else
                mod_timer(&q->timeout, jiffies + BUFFER_TIMEOUT);
-       }
        if (bc != 1)
-               printk("%s: %d buffers handled (should be 1)\n",
+               printk(KERN_WARNING "%s: %d buffers handled (should be 1)\n",
                       __func__, bc);
 }
 
@@ -381,8 +380,7 @@ int cx23885_sram_channel_setup(struct cx23885_dev *dev,
        unsigned int i, lines;
        u32 cdt;
 
-       if (ch->cmds_start == 0)
-       {
+       if (ch->cmds_start == 0) {
                dprintk(1, "%s() Erasing channel [%s]\n", __func__,
                        ch->name);
                cx_write(ch->ptr1_reg, 0);
@@ -418,15 +416,15 @@ int cx23885_sram_channel_setup(struct cx23885_dev *dev,
 
        /* write CMDS */
        if (ch->jumponly)
-               cx_write(ch->cmds_start +  0, 8);
+               cx_write(ch->cmds_start + 0, 8);
        else
-               cx_write(ch->cmds_start +  0, risc);
+               cx_write(ch->cmds_start + 0, risc);
        cx_write(ch->cmds_start +  4, 0); /* 64 bits 63-32 */
        cx_write(ch->cmds_start +  8, cdt);
        cx_write(ch->cmds_start + 12, (lines*16) >> 3);
        cx_write(ch->cmds_start + 16, ch->ctrl_start);
        if (ch->jumponly)
-               cx_write(ch->cmds_start + 20, 0x80000000 | (64 >> 2) );
+               cx_write(ch->cmds_start + 20, 0x80000000 | (64 >> 2));
        else
                cx_write(ch->cmds_start + 20, 64 >> 2);
        for (i = 24; i < 80; i += 4)
@@ -436,9 +434,9 @@ int cx23885_sram_channel_setup(struct cx23885_dev *dev,
        cx_write(ch->ptr1_reg, ch->fifo_start);
        cx_write(ch->ptr2_reg, cdt);
        cx_write(ch->cnt2_reg, (lines*16) >> 3);
-       cx_write(ch->cnt1_reg, (bpl >> 3) -1);
+       cx_write(ch->cnt1_reg, (bpl >> 3) - 1);
 
-       dprintk(2,"[bridge %d] sram setup %s: bpl=%d lines=%d\n",
+       dprintk(2, "[bridge %d] sram setup %s: bpl=%d lines=%d\n",
                dev->bridge,
                ch->name,
                bpl,
@@ -469,43 +467,43 @@ void cx23885_sram_channel_dump(struct cx23885_dev *dev,
        u32 risc;
        unsigned int i, j, n;
 
-       printk("%s: %s - dma channel status dump\n",
+       printk(KERN_WARNING "%s: %s - dma channel status dump\n",
               dev->name, ch->name);
        for (i = 0; i < ARRAY_SIZE(name); i++)
-               printk("%s:   cmds: %-15s: 0x%08x\n",
+               printk(KERN_WARNING "%s:   cmds: %-15s: 0x%08x\n",
                       dev->name, name[i],
                       cx_read(ch->cmds_start + 4*i));
 
        for (i = 0; i < 4; i++) {
                risc = cx_read(ch->cmds_start + 4 * (i + 14));
-               printk("%s:   risc%d: ", dev->name, i);
+               printk(KERN_WARNING "%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,
+               printk(KERN_WARNING "%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));
-                       printk("%s:   iq %x: 0x%08x [ arg #%d ]\n",
+                       printk(KERN_WARNING "%s:   iq %x: 0x%08x [ arg #%d ]\n",
                               dev->name, i+j, risc, j);
                }
        }
 
-       printk("%s: fifo: 0x%08x -> 0x%x\n",
+       printk(KERN_WARNING "%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",
+       printk(KERN_WARNING "%s: ctrl: 0x%08x -> 0x%x\n",
               dev->name, ch->ctrl_start, ch->ctrl_start + 6*16);
-       printk("%s:   ptr1_reg: 0x%08x\n",
+       printk(KERN_WARNING "%s:   ptr1_reg: 0x%08x\n",
               dev->name, cx_read(ch->ptr1_reg));
-       printk("%s:   ptr2_reg: 0x%08x\n",
+       printk(KERN_WARNING "%s:   ptr2_reg: 0x%08x\n",
               dev->name, cx_read(ch->ptr2_reg));
-       printk("%s:   cnt1_reg: 0x%08x\n",
+       printk(KERN_WARNING "%s:   cnt1_reg: 0x%08x\n",
               dev->name, cx_read(ch->cnt1_reg));
-       printk("%s:   cnt2_reg: 0x%08x\n",
+       printk(KERN_WARNING "%s:   cnt2_reg: 0x%08x\n",
               dev->name, cx_read(ch->cnt2_reg));
 }
 
@@ -515,13 +513,13 @@ static void cx23885_risc_disasm(struct cx23885_tsport *port,
        struct cx23885_dev *dev = port->dev;
        unsigned int i, j, n;
 
-       printk("%s: risc disasm: %p [dma=0x%08lx]\n",
+       printk(KERN_INFO "%s: risc disasm: %p [dma=0x%08lx]\n",
               dev->name, risc->cpu, (unsigned long)risc->dma);
        for (i = 0; i < (risc->size >> 2); i += n) {
-               printk("%s:   %04d: ", dev->name, i);
+               printk(KERN_INFO "%s:   %04d: ", dev->name, i);
                n = cx23885_risc_decode(le32_to_cpu(risc->cpu[i]));
                for (j = 1; j < n; j++)
-                       printk("%s:   %04d: 0x%08x [ arg #%d ]\n",
+                       printk(KERN_INFO "%s:   %04d: 0x%08x [ arg #%d ]\n",
                               dev->name, i + j, risc->cpu[i + j], j);
                if (risc->cpu[i] == cpu_to_le32(RISC_JUMP))
                        break;
@@ -600,7 +598,7 @@ static int cx23885_pci_quirks(struct cx23885_dev *dev)
         * when DMA begins if RDR_TLCTL0 bit4 is not cleared. It does not
         * occur on the cx23887 bridge.
         */
-       if(dev->bridge == CX23885_BRIDGE_885)
+       if (dev->bridge == CX23885_BRIDGE_885)
                cx_clear(RDR_TLCTL0, 1 << 4);
 
        return 0;
@@ -608,13 +606,13 @@ 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),
+       if (request_mem_region(pci_resource_start(dev->pci, 0),
+                              pci_resource_len(dev->pci, 0),
                               dev->name))
                return 0;
 
        printk(KERN_ERR "%s: can't get MMIO memory @ 0x%llx\n",
-               dev->name, (unsigned long long)pci_resource_start(dev->pci,0));
+               dev->name, (unsigned long long)pci_resource_start(dev->pci, 0));
 
        return -EBUSY;
 }
@@ -623,7 +621,8 @@ 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);
 
-static int cx23885_init_tsport(struct cx23885_dev *dev, struct cx23885_tsport *port, int portno)
+static int cx23885_init_tsport(struct cx23885_dev *dev,
+       struct cx23885_tsport *port, int portno)
 {
        dprintk(1, "%s(portno=%d)\n", __func__, portno);
 
@@ -643,7 +642,18 @@ static int cx23885_init_tsport(struct cx23885_dev *dev, struct cx23885_tsport *p
        port->mpegq.timeout.data = (unsigned long)port;
        init_timer(&port->mpegq.timeout);
 
-       switch(portno) {
+       mutex_init(&port->frontends.lock);
+       INIT_LIST_HEAD(&port->frontends.felist);
+       port->frontends.active_fe_id = 0;
+
+       /* This should be hardcoded allow a single frontend
+        * attachment to this tsport, keeping the -dvb.c
+        * code clean and safe.
+        */
+       if (!port->num_frontends)
+               port->num_frontends = 1;
+
+       switch (portno) {
        case 1:
                port->reg_gpcnt          = VID_B_GPCNT;
                port->reg_gpcnt_ctl      = VID_B_GPCNT_CTL;
@@ -744,13 +754,13 @@ static int cx23885_dev_setup(struct cx23885_dev *dev)
        mutex_unlock(&devlist);
 
        /* Configure the internal memory */
-       if(dev->pci->device == 0x8880) {
+       if (dev->pci->device == 0x8880) {
                dev->bridge = CX23885_BRIDGE_887;
                /* Apply a sensible clock frequency for the PCIe bridge */
                dev->clk_freq = 25000000;
                dev->sram_channels = cx23887_sram_channels;
        } else
-       if(dev->pci->device == 0x8852) {
+       if (dev->pci->device == 0x8852) {
                dev->bridge = CX23885_BRIDGE_885;
                /* Apply a sensible clock frequency for the PCIe bridge */
                dev->clk_freq = 28000000;
@@ -831,8 +841,8 @@ 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));
+       dev->lmmio = ioremap(pci_resource_start(dev->pci, 0),
+                            pci_resource_len(dev->pci, 0));
 
        dev->bmmio = (u8 __iomem *)dev->lmmio;
 
@@ -862,7 +872,7 @@ static int cx23885_dev_setup(struct cx23885_dev *dev)
        cx23885_i2c_register(&dev->i2c_bus[1]);
        cx23885_i2c_register(&dev->i2c_bus[2]);
        cx23885_card_setup(dev);
-       cx23885_call_i2c_clients (&dev->i2c_bus[0], TUNER_SET_STANDBY, NULL);
+       cx23885_call_i2c_clients(&dev->i2c_bus[0], TUNER_SET_STANDBY, NULL);
        cx23885_ir_init(dev);
 
        if (cx23885_boards[dev->board].porta == CX23885_ANALOG_VIDEO) {
@@ -908,8 +918,8 @@ static int cx23885_dev_setup(struct cx23885_dev *dev)
 
 static void cx23885_dev_unregister(struct cx23885_dev *dev)
 {
-       release_mem_region(pci_resource_start(dev->pci,0),
-                          pci_resource_len(dev->pci,0));
+       release_mem_region(pci_resource_start(dev->pci, 0),
+                          pci_resource_len(dev->pci, 0));
 
        if (!atomic_dec_and_test(&dev->refcount))
                return;
@@ -936,7 +946,7 @@ static void cx23885_dev_unregister(struct cx23885_dev *dev)
        iounmap(dev->lmmio);
 }
 
-static __le32cx23885_risc_field(__le32 *rp, struct scatterlist *sglist,
+static __le32 *cx23885_risc_field(__le32 *rp, struct scatterlist *sglist,
                               unsigned int offset, u32 sync_line,
                               unsigned int bpl, unsigned int padding,
                               unsigned int lines)
@@ -957,31 +967,31 @@ static __le32* cx23885_risc_field(__le32 *rp, struct scatterlist *sglist,
                }
                if (bpl <= sg_dma_len(sg)-offset) {
                        /* fits into current chunk */
-                       *(rp++)=cpu_to_le32(RISC_WRITE|RISC_SOL|RISC_EOL|bpl);
-                       *(rp++)=cpu_to_le32(sg_dma_address(sg)+offset);
-                       *(rp++)=cpu_to_le32(0); /* bits 63-32 */
-                       offset+=bpl;
+                       *(rp++) = cpu_to_le32(RISC_WRITE|RISC_SOL|RISC_EOL|bpl);
+                       *(rp++) = cpu_to_le32(sg_dma_address(sg)+offset);
+                       *(rp++) = cpu_to_le32(0); /* bits 63-32 */
+                       offset += bpl;
                } else {
                        /* scanline needs to be split */
                        todo = bpl;
-                       *(rp++)=cpu_to_le32(RISC_WRITE|RISC_SOL|
+                       *(rp++) = cpu_to_le32(RISC_WRITE|RISC_SOL|
                                            (sg_dma_len(sg)-offset));
-                       *(rp++)=cpu_to_le32(sg_dma_address(sg)+offset);
-                       *(rp++)=cpu_to_le32(0); /* bits 63-32 */
+                       *(rp++) = cpu_to_le32(sg_dma_address(sg)+offset);
+                       *(rp++) = cpu_to_le32(0); /* bits 63-32 */
                        todo -= (sg_dma_len(sg)-offset);
                        offset = 0;
                        sg++;
                        while (todo > sg_dma_len(sg)) {
-                               *(rp++)=cpu_to_le32(RISC_WRITE|
+                               *(rp++) = cpu_to_le32(RISC_WRITE|
                                                    sg_dma_len(sg));
-                               *(rp++)=cpu_to_le32(sg_dma_address(sg));
-                               *(rp++)=cpu_to_le32(0); /* bits 63-32 */
+                               *(rp++) = cpu_to_le32(sg_dma_address(sg));
+                               *(rp++) = cpu_to_le32(0); /* bits 63-32 */
                                todo -= sg_dma_len(sg);
                                sg++;
                        }
-                       *(rp++)=cpu_to_le32(RISC_WRITE|RISC_EOL|todo);
-                       *(rp++)=cpu_to_le32(sg_dma_address(sg));
-                       *(rp++)=cpu_to_le32(0); /* bits 63-32 */
+                       *(rp++) = cpu_to_le32(RISC_WRITE|RISC_EOL|todo);
+                       *(rp++) = cpu_to_le32(sg_dma_address(sg));
+                       *(rp++) = cpu_to_le32(0); /* bits 63-32 */
                        offset += todo;
                }
                offset += padding;
@@ -1010,9 +1020,11 @@ int cx23885_risc_buffer(struct pci_dev *pci, struct btcx_riscmem *risc,
           can cause next bpl to start close to a page border.  First DMA
           region may be smaller than PAGE_SIZE */
        /* write and jump need and extra dword */
-       instructions  = fields * (1 + ((bpl + padding) * lines) / PAGE_SIZE + lines);
+       instructions  = fields * (1 + ((bpl + padding) * lines)
+               / PAGE_SIZE + lines);
        instructions += 2;
-       if ((rc = btcx_riscmem_alloc(pci,risc,instructions*12)) < 0)
+       rc = btcx_riscmem_alloc(pci, risc, instructions*12);
+       if (rc < 0)
                return rc;
 
        /* write risc instructions */
@@ -1026,7 +1038,7 @@ int cx23885_risc_buffer(struct pci_dev *pci, struct btcx_riscmem *risc,
 
        /* save pointer to jmp instruction address */
        risc->jmp = rp;
-       BUG_ON((risc->jmp - risc->cpu + 2) * sizeof (*risc->cpu) > risc->size);
+       BUG_ON((risc->jmp - risc->cpu + 2) * sizeof(*risc->cpu) > risc->size);
        return 0;
 }
 
@@ -1048,7 +1060,8 @@ static int cx23885_risc_databuffer(struct pci_dev *pci,
        instructions  = 1 + (bpl * lines) / PAGE_SIZE + lines;
        instructions += 1;
 
-       if ((rc = btcx_riscmem_alloc(pci,risc,instructions*12)) < 0)
+       rc = btcx_riscmem_alloc(pci, risc, instructions*12);
+       if (rc < 0)
                return rc;
 
        /* write risc instructions */
@@ -1057,7 +1070,7 @@ static int cx23885_risc_databuffer(struct pci_dev *pci,
 
        /* save pointer to jmp instruction address */
        risc->jmp = rp;
-       BUG_ON((risc->jmp - risc->cpu + 2) * sizeof (*risc->cpu) > risc->size);
+       BUG_ON((risc->jmp - risc->cpu + 2) * sizeof(*risc->cpu) > risc->size);
        return 0;
 }
 
@@ -1067,7 +1080,8 @@ int cx23885_risc_stopper(struct pci_dev *pci, struct btcx_riscmem *risc,
        __le32 *rp;
        int rc;
 
-       if ((rc = btcx_riscmem_alloc(pci, risc, 4*16)) < 0)
+       rc = btcx_riscmem_alloc(pci, risc, 4*16);
+       if (rc < 0)
                return rc;
 
        /* write risc instructions */
@@ -1161,22 +1175,23 @@ static int cx23885_start_dma(struct cx23885_tsport *port,
 
        /* setup fifo + format */
        cx23885_sram_channel_setup(dev,
-                                  &dev->sram_channels[ port->sram_chno ],
+                                  &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 ] );
+       if (debug > 5) {
+               cx23885_sram_channel_dump(dev,
+                       &dev->sram_channels[port->sram_chno]);
                cx23885_risc_disasm(port, &buf->risc);
        }
 
        /* write TS length to chip */
        cx_write(port->reg_lngth, buf->vb.width);
 
-       if ( (!(cx23885_boards[dev->board].portb & CX23885_MPEG_DVB)) &&
-               (!(cx23885_boards[dev->board].portc & CX23885_MPEG_DVB)) ) {
-               printk( "%s() Failed. Unsupported value in .portb/c (0x%08x)/(0x%08x)\n",
+       if ((!(cx23885_boards[dev->board].portb & CX23885_MPEG_DVB)) &&
+               (!(cx23885_boards[dev->board].portc & CX23885_MPEG_DVB))) {
+               printk("%s() Unsupported .portb/c (0x%08x)/(0x%08x)\n",
                        __func__,
                        cx23885_boards[dev->board].portb,
-                       cx23885_boards[dev->board].portc );
+                       cx23885_boards[dev->board].portc);
                return -EINVAL;
        }
 
@@ -1186,7 +1201,7 @@ static int cx23885_start_dma(struct cx23885_tsport *port,
        udelay(100);
 
        /* If the port supports SRC SELECT, configure it */
-       if(port->reg_src_sel)
+       if (port->reg_src_sel)
                cx_write(port->reg_src_sel, port->src_sel_val);
 
        cx_write(port->reg_hw_sop_ctrl, port->hw_sop_ctrl_val);
@@ -1195,7 +1210,7 @@ static int cx23885_start_dma(struct cx23885_tsport *port,
        cx_write(port->reg_gen_ctrl, port->gen_ctrl_val);
        udelay(100);
 
-       // NOTE: this is 2 (reserved) for portb, does it matter?
+       /* NOTE: this is 2 (reserved) for portb, does it matter? */
        /* reset counter to zero */
        cx_write(port->reg_gpcnt_ctl, 3);
        q->count = 1;
@@ -1229,11 +1244,11 @@ static int cx23885_start_dma(struct cx23885_tsport *port,
                cx_write(ALT_PIN_OUT_SEL, 0x10100045);
        }
 
-       switch(dev->bridge) {
+       switch (dev->bridge) {
        case CX23885_BRIDGE_885:
        case CX23885_BRIDGE_887:
                /* enable irqs */
-               dprintk(1, "%s() enabling TS int's and DMA\n", __func__ );
+               dprintk(1, "%s() enabling TS int's and DMA\n", __func__);
                cx_set(port->reg_ts_int_msk,  port->ts_int_msk_val);
                cx_set(port->reg_dma_ctl, port->dma_ctl_val);
                cx_set(PCI_INT_MSK, dev->pci_irqmask | port->pci_irqmask);
@@ -1292,8 +1307,7 @@ int cx23885_restart_queue(struct cx23885_tsport *port,
        struct cx23885_buffer *buf;
 
        dprintk(5, "%s()\n", __func__);
-       if (list_empty(&q->active))
-       {
+       if (list_empty(&q->active)) {
                struct cx23885_buffer *prev;
                prev = NULL;
 
@@ -1311,7 +1325,7 @@ int cx23885_restart_queue(struct cx23885_tsport *port,
                                buf->vb.state = VIDEOBUF_ACTIVE;
                                buf->count    = q->count++;
                                mod_timer(&q->timeout, jiffies+BUFFER_TIMEOUT);
-                               dprintk(5, "[%p/%d] restart_queue - first active\n",
+                               dprintk(5, "[%p/%d] restart_queue - f/active\n",
                                        buf, buf->vb.i);
 
                        } else if (prev->vb.width  == buf->vb.width  &&
@@ -1322,8 +1336,9 @@ int cx23885_restart_queue(struct cx23885_tsport *port,
                                buf->vb.state = VIDEOBUF_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",
+                               /* 64 bit bits 63-32 */
+                               prev->risc.jmp[2] = cpu_to_le32(0);
+                               dprintk(5, "[%p/%d] restart_queue - m/active\n",
                                        buf, buf->vb.i);
                        } else {
                                return 0;
@@ -1362,7 +1377,8 @@ 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)))
+               rc = videobuf_iolock(q, &buf->vb, NULL);
+               if (0 != rc)
                        goto fail;
                cx23885_risc_databuffer(dev->pci, &buf->risc,
                                        videobuf_to_dma(&buf->vb)->sglist,
@@ -1388,7 +1404,7 @@ void cx23885_buf_queue(struct cx23885_tsport *port, struct cx23885_buffer *buf)
        buf->risc.jmp[2] = cpu_to_le32(0); /* bits 63-32 */
 
        if (list_empty(&cx88q->active)) {
-               dprintk( 1, "queue is empty - first active\n" );
+               dprintk(1, "queue is empty - first active\n");
                list_add_tail(&buf->vb.queue, &cx88q->active);
                cx23885_start_dma(port, cx88q, buf);
                buf->vb.state = VIDEOBUF_ACTIVE;
@@ -1397,7 +1413,7 @@ void cx23885_buf_queue(struct cx23885_tsport *port, struct cx23885_buffer *buf)
                dprintk(1, "[%p/%d] %s - first active\n",
                        buf, buf->vb.i, __func__);
        } else {
-               dprintk( 1, "queue is not empty - append to active\n" );
+               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);
@@ -1405,7 +1421,7 @@ void cx23885_buf_queue(struct cx23885_tsport *port, struct cx23885_buffer *buf)
                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",
+               dprintk(1, "[%p/%d] %s - append to active\n",
                         buf, buf->vb.i, __func__);
        }
 }
@@ -1431,7 +1447,7 @@ static void do_cancel_buffers(struct cx23885_tsport *port, char *reason,
                        buf, buf->vb.i, reason, (unsigned long)buf->risc.dma);
        }
        if (restart) {
-               dprintk(1, "restarting queue\n" );
+               dprintk(1, "restarting queue\n");
                cx23885_restart_queue(port, q);
        }
        spin_unlock_irqrestore(&port->slock, flags);
@@ -1453,10 +1469,11 @@ static void cx23885_timeout(unsigned long data)
        struct cx23885_tsport *port = (struct cx23885_tsport *)data;
        struct cx23885_dev *dev = port->dev;
 
-       dprintk(1, "%s()\n",__func__);
+       dprintk(1, "%s()\n", __func__);
 
        if (debug > 5)
-               cx23885_sram_channel_dump(dev, &dev->sram_channels[ port->sram_chno ]);
+               cx23885_sram_channel_dump(dev,
+                       &dev->sram_channels[port->sram_chno]);
 
        cx23885_stop_dma(port);
        do_cancel_buffers(port, "timeout", 1);
@@ -1532,16 +1549,23 @@ static int cx23885_irq_ts(struct cx23885_tsport *port, u32 status)
        if ((status & VID_BC_MSK_OPC_ERR) ||
                (status & VID_BC_MSK_BAD_PKT) ||
                (status & VID_BC_MSK_SYNC) ||
-               (status & VID_BC_MSK_OF))
-       {
+               (status & VID_BC_MSK_OF)) {
+
                if (status & VID_BC_MSK_OPC_ERR)
-                       dprintk(7, " (VID_BC_MSK_OPC_ERR 0x%08x)\n", VID_BC_MSK_OPC_ERR);
+                       dprintk(7, " (VID_BC_MSK_OPC_ERR 0x%08x)\n",
+                               VID_BC_MSK_OPC_ERR);
+
                if (status & VID_BC_MSK_BAD_PKT)
-                       dprintk(7, " (VID_BC_MSK_BAD_PKT 0x%08x)\n", VID_BC_MSK_BAD_PKT);
+                       dprintk(7, " (VID_BC_MSK_BAD_PKT 0x%08x)\n",
+                               VID_BC_MSK_BAD_PKT);
+
                if (status & VID_BC_MSK_SYNC)
-                       dprintk(7, " (VID_BC_MSK_SYNC    0x%08x)\n", VID_BC_MSK_SYNC);
+                       dprintk(7, " (VID_BC_MSK_SYNC    0x%08x)\n",
+                               VID_BC_MSK_SYNC);
+
                if (status & VID_BC_MSK_OF)
-                       dprintk(7, " (VID_BC_MSK_OF      0x%08x)\n", VID_BC_MSK_OF);
+                       dprintk(7, " (VID_BC_MSK_OF      0x%08x)\n",
+                               VID_BC_MSK_OF);
 
                printk(KERN_ERR "%s: mpeg risc op code error\n", dev->name);
 
@@ -1595,7 +1619,7 @@ static irqreturn_t cx23885_irq(int irq, void *dev_id)
        ts2_status = cx_read(VID_C_INT_STAT);
        ts2_mask = cx_read(VID_C_INT_MSK);
 
-       if ( (pci_status == 0) && (ts2_status == 0) && (ts1_status == 0) )
+       if ((pci_status == 0) && (ts2_status == 0) && (ts1_status == 0))
                goto out;
 
        vida_count = cx_read(VID_A_GPCNT);
@@ -1610,38 +1634,56 @@ 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, ts2_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) )
-       {
+       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)) {
 
                if (pci_status & PCI_MSK_RISC_RD)
-                       dprintk(7, " (PCI_MSK_RISC_RD   0x%08x)\n", PCI_MSK_RISC_RD);
+                       dprintk(7, " (PCI_MSK_RISC_RD   0x%08x)\n",
+                               PCI_MSK_RISC_RD);
+
                if (pci_status & PCI_MSK_RISC_WR)
-                       dprintk(7, " (PCI_MSK_RISC_WR   0x%08x)\n", PCI_MSK_RISC_WR);
+                       dprintk(7, " (PCI_MSK_RISC_WR   0x%08x)\n",
+                               PCI_MSK_RISC_WR);
+
                if (pci_status & PCI_MSK_AL_RD)
-                       dprintk(7, " (PCI_MSK_AL_RD     0x%08x)\n", PCI_MSK_AL_RD);
+                       dprintk(7, " (PCI_MSK_AL_RD     0x%08x)\n",
+                               PCI_MSK_AL_RD);
+
                if (pci_status & PCI_MSK_AL_WR)
-                       dprintk(7, " (PCI_MSK_AL_WR     0x%08x)\n", PCI_MSK_AL_WR);
+                       dprintk(7, " (PCI_MSK_AL_WR     0x%08x)\n",
+                               PCI_MSK_AL_WR);
+
                if (pci_status & PCI_MSK_APB_DMA)
-                       dprintk(7, " (PCI_MSK_APB_DMA   0x%08x)\n", PCI_MSK_APB_DMA);
+                       dprintk(7, " (PCI_MSK_APB_DMA   0x%08x)\n",
+                               PCI_MSK_APB_DMA);
+
                if (pci_status & PCI_MSK_VID_C)
-                       dprintk(7, " (PCI_MSK_VID_C     0x%08x)\n", PCI_MSK_VID_C);
+                       dprintk(7, " (PCI_MSK_VID_C     0x%08x)\n",
+                               PCI_MSK_VID_C);
+
                if (pci_status & PCI_MSK_VID_B)
-                       dprintk(7, " (PCI_MSK_VID_B     0x%08x)\n", PCI_MSK_VID_B);
+                       dprintk(7, " (PCI_MSK_VID_B     0x%08x)\n",
+                               PCI_MSK_VID_B);
+
                if (pci_status & PCI_MSK_VID_A)
-                       dprintk(7, " (PCI_MSK_VID_A     0x%08x)\n", PCI_MSK_VID_A);
+                       dprintk(7, " (PCI_MSK_VID_A     0x%08x)\n",
+                               PCI_MSK_VID_A);
+
                if (pci_status & PCI_MSK_AUD_INT)
-                       dprintk(7, " (PCI_MSK_AUD_INT   0x%08x)\n", PCI_MSK_AUD_INT);
+                       dprintk(7, " (PCI_MSK_AUD_INT   0x%08x)\n",
+                               PCI_MSK_AUD_INT);
+
                if (pci_status & PCI_MSK_AUD_EXT)
-                       dprintk(7, " (PCI_MSK_AUD_EXT   0x%08x)\n", PCI_MSK_AUD_EXT);
+                       dprintk(7, " (PCI_MSK_AUD_EXT   0x%08x)\n",
+                               PCI_MSK_AUD_EXT);
 
        }
 
@@ -1753,13 +1795,13 @@ static struct pci_device_id cx23885_pci_tbl[] = {
                .device       = 0x8852,
                .subvendor    = PCI_ANY_ID,
                .subdevice    = PCI_ANY_ID,
-       },{
+       }, {
                /* CX23887 Rev 2 */
                .vendor       = 0x14f1,
                .device       = 0x8880,
                .subvendor    = PCI_ANY_ID,
                .subdevice    = PCI_ANY_ID,
-       },{
+       }, {
                /* --- end of list --- */
        }
 };
@@ -1797,9 +1839,3 @@ module_init(cx23885_init);
 module_exit(cx23885_fini);
 
 /* ----------------------------------------------------------- */
-/*
- * 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
- */