Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9c8ced51 authored by Steven Toth's avatar Steven Toth Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (9251): cx23885: Checkpatch compliance 



cx23885: Checkpatch compliance

Signed-off-by: default avatarSteven Toth <stoth@linuxtv.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 2af03eea

drivers/media/video/cx23885/cx23885-cards.c

+89 −63
Original line number Diff line number Diff line
@@ -247,23 +247,25 @@ void cx23885_card_list(struct cx23885_dev *dev) 


	if (0 == dev->pci->subsystem_vendor &&

	    0 == dev->pci->subsystem_device) {

		printk("%s: Your board has no valid PCIe Subsystem ID and thus can't\n"

		       "%s: be autodetected.  Please pass card=<n> insmod option to\n"

		       "%s: workaround that.  Redirect complaints to the vendor of\n"

		       "%s: the TV card.  Best regards,\n"

		printk(KERN_INFO

			"%s: Board has no valid PCIe Subsystem ID and can't\n"

		       "%s: be autodetected. Pass card=<n> insmod option\n"

		       "%s: to workaround that. Redirect complaints to the\n"

		       "%s: vendor of the TV card.  Best regards,\n"

		       "%s:         -- tux\n",

		       dev->name, dev->name, dev->name, dev->name, dev->name);

	} else {

		printk("%s: Your board isn't known (yet) to the driver.  You can\n"

		       "%s: try to pick one of the existing card configs via\n"

		printk(KERN_INFO

			"%s: Your board isn't known (yet) to the driver.\n"

		       "%s: Try to pick one of the existing card configs via\n"

		       "%s: card=<n> insmod option.  Updating to the latest\n"

		       "%s: version might help as well.\n",

		       dev->name, dev->name, dev->name, dev->name);

	}

	printk("%s: Here is a list of valid choices for the card=<n> insmod option:\n",

	printk(KERN_INFO "%s: Here is a list of valid choices for the card=<n> insmod option:\n",

	       dev->name);

	for (i = 0; i < cx23885_bcount; i++)

		printk("%s:    card=%d -> %s\n",

		printk(KERN_INFO "%s:    card=%d -> %s\n",

		       dev->name, i, cx23885_boards[i].name);

}
@@ -271,11 +273,11 @@ static void hauppauge_eeprom(struct cx23885_dev *dev, u8 *eeprom_data) 
{

	struct tveeprom tv;



	tveeprom_hauppauge_analog(&dev->i2c_bus[0].i2c_client, &tv, eeprom_data);

	tveeprom_hauppauge_analog(&dev->i2c_bus[0].i2c_client, &tv,

		eeprom_data);



	/* Make sure we support the board model */

	switch (tv.model)

	{

	switch (tv.model) {

	case 71009:

		/* WinTV-HVR1200 (PCIe, Retail, full height)

		 * DVB-T and basic analog */
@@ -303,21 +305,51 @@ static void hauppauge_eeprom(struct cx23885_dev *dev, u8 *eeprom_data) 
	case 71999:

		/* WinTV-HVR1200 (PCIe, OEM, full height)

		 * DVB-T and basic analog */

	case 76601: /* WinTV-HVR1800lp (PCIe, Retail, No IR, Dual channel ATSC and MPEG2 HW Encoder */

	case 77001: /* WinTV-HVR1500 (Express Card, OEM, No IR, ATSC and Basic analog */

	case 77011: /* WinTV-HVR1500 (Express Card, Retail, No IR, ATSC and Basic analog */

	case 77041: /* WinTV-HVR1500Q (Express Card, OEM, No IR, ATSC/QAM and Basic analog */

	case 77051: /* WinTV-HVR1500Q (Express Card, Retail, No IR, ATSC/QAM and Basic analog */

	case 78011: /* WinTV-HVR1800 (PCIe, Retail, 3.5mm in, IR, No FM, Dual channel ATSC and MPEG2 HW Encoder */

	case 78501: /* WinTV-HVR1800 (PCIe, OEM, RCA in, No IR, FM, Dual channel ATSC and MPEG2 HW Encoder */

	case 78521: /* WinTV-HVR1800 (PCIe, OEM, RCA in, No IR, FM, Dual channel ATSC and MPEG2 HW Encoder */

	case 78531: /* WinTV-HVR1800 (PCIe, OEM, RCA in, No IR, No FM, Dual channel ATSC and MPEG2 HW Encoder */

	case 78631: /* WinTV-HVR1800 (PCIe, OEM, No IR, No FM, Dual channel ATSC and MPEG2 HW Encoder */

	case 79001: /* WinTV-HVR1250 (PCIe, Retail, IR, full height, ATSC and Basic analog */

	case 79101: /* WinTV-HVR1250 (PCIe, Retail, IR, half height, ATSC and Basic analog */

	case 79561: /* WinTV-HVR1250 (PCIe, OEM, No IR, half height, ATSC and Basic analog */

	case 79571: /* WinTV-HVR1250 (PCIe, OEM, No IR, full height, ATSC and Basic analog */

	case 79671: /* WinTV-HVR1250 (PCIe, OEM, No IR, half height, ATSC and Basic analog */

	case 76601:

		/* WinTV-HVR1800lp (PCIe, Retail, No IR, Dual

			channel ATSC and MPEG2 HW Encoder */

	case 77001:

		/* WinTV-HVR1500 (Express Card, OEM, No IR, ATSC

			and Basic analog */

	case 77011:

		/* WinTV-HVR1500 (Express Card, Retail, No IR, ATSC

			and Basic analog */

	case 77041:

		/* WinTV-HVR1500Q (Express Card, OEM, No IR, ATSC/QAM

			and Basic analog */

	case 77051:

		/* WinTV-HVR1500Q (Express Card, Retail, No IR, ATSC/QAM

			and Basic analog */

	case 78011:

		/* WinTV-HVR1800 (PCIe, Retail, 3.5mm in, IR, No FM,

			Dual channel ATSC and MPEG2 HW Encoder */

	case 78501:

		/* WinTV-HVR1800 (PCIe, OEM, RCA in, No IR, FM,

			Dual channel ATSC and MPEG2 HW Encoder */

	case 78521:

		/* WinTV-HVR1800 (PCIe, OEM, RCA in, No IR, FM,

			Dual channel ATSC and MPEG2 HW Encoder */

	case 78531:

		/* WinTV-HVR1800 (PCIe, OEM, RCA in, No IR, No FM,

			Dual channel ATSC and MPEG2 HW Encoder */

	case 78631:

		/* WinTV-HVR1800 (PCIe, OEM, No IR, No FM,

			Dual channel ATSC and MPEG2 HW Encoder */

	case 79001:

		/* WinTV-HVR1250 (PCIe, Retail, IR, full height,

			ATSC and Basic analog */

	case 79101:

		/* WinTV-HVR1250 (PCIe, Retail, IR, half height,

			ATSC and Basic analog */

	case 79561:

		/* WinTV-HVR1250 (PCIe, OEM, No IR, half height,

			ATSC and Basic analog */

	case 79571:

		/* WinTV-HVR1250 (PCIe, OEM, No IR, full height,

		 ATSC and Basic analog */

	case 79671:

		/* WinTV-HVR1250 (PCIe, OEM, No IR, half height,

			ATSC and Basic analog */

	case 80019:

		/* WinTV-HVR1400 (Express Card, Retail, IR,

		 * DVB-T and Basic analog */
@@ -329,7 +361,8 @@ static void hauppauge_eeprom(struct cx23885_dev *dev, u8 *eeprom_data) 
		 * DVB-T and MPEG2 HW Encoder */

		break;

	default:

		printk("%s: warning: unknown hauppauge model #%d\n", dev->name, tv.model);

		printk(KERN_WARNING "%s: warning: unknown hauppauge model #%d\n",

			dev->name, tv.model);

		break;

	}
@@ -617,10 +650,3 @@ void cx23885_card_setup(struct cx23885_dev *dev) 
}



/* ------------------------------------------------------------------ */
 


/*

 * 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

 */

drivers/media/video/cx23885/cx23885-core.c

+146 −121
Original line number Diff line number Diff line
@@ -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);
@@ -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;
@@ -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);
@@ -1021,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 */
@@ -1059,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 */
@@ -1078,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 */
@@ -1175,7 +1178,8 @@ static int cx23885_start_dma(struct cx23885_tsport *port, 
				   &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_sram_channel_dump(dev,

			&dev->sram_channels[port->sram_chno]);

		cx23885_risc_disasm(port, &buf->risc);

	}
@@ -1184,7 +1188,7 @@ static int cx23885_start_dma(struct cx23885_tsport *port, 


	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",

		printk("%s() Unsupported .portb/c (0x%08x)/(0x%08x)\n",

			__func__,

			cx23885_boards[dev->board].portb,

			cx23885_boards[dev->board].portc);
@@ -1206,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;
@@ -1303,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;
@@ -1322,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  &&
@@ -1333,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;
@@ -1373,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,
@@ -1467,7 +1472,8 @@ static void cx23885_timeout(unsigned long data) 
	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);
@@ -1543,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);
@@ -1630,29 +1643,47 @@ static irqreturn_t cx23885_irq(int irq, void *dev_id) 
	    (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_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);



	}
@@ -1808,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

 */

drivers/media/video/cx23885/cx23885-dvb.c

+18 −18
Original line number Diff line number Diff line
@@ -450,7 +450,8 @@ static int dvb_register(struct cx23885_tsport *port) 
				.fname   = XC3028L_DEFAULT_FIRMWARE,

				.max_len = 64,

				.demod   = 5000,

				/* This is true for all demods with v36 firmware? */

				/* This is true for all demods with

					v36 firmware? */

				.type    = XC2028_D2633,

			};
@@ -525,12 +526,14 @@ static int dvb_register(struct cx23885_tsport *port) 
		}

		break;

	default:

		printk("%s: The frontend of your DVB/ATSC card isn't supported yet\n",

		printk(KERN_INFO "%s: The frontend of your DVB/ATSC card "

			" isn't supported yet\n",

		       dev->name);

		break;

	}

	if (NULL == fe0->dvb.frontend) {

		printk("%s: frontend initialization failed\n", dev->name);

		printk(KERN_ERR "%s: frontend initialization failed\n",

			dev->name);

		return -1;

	}

	/* define general-purpose callback pointer */
@@ -568,7 +571,8 @@ int cx23885_dvb_register(struct cx23885_tsport *port) 
		port->num_frontends);



	for (i = 1; i <= port->num_frontends; i++) {

		if (videobuf_dvb_alloc_frontend(dev, &port->frontends, i) == NULL) {

		if (videobuf_dvb_alloc_frontend(dev,

			&port->frontends, i) == NULL) {

			printk(KERN_ERR "%s() failed to alloc\n", __func__);

			return -ENOMEM;

		}
@@ -578,7 +582,7 @@ int cx23885_dvb_register(struct cx23885_tsport *port) 
			err = -EINVAL;



		dprintk(1, "%s\n", __func__);

		dprintk(1, " ->being probed by Card=%d Name=%s, PCI %02x:%02x\n",

		dprintk(1, " ->probed by Card=%d Name=%s, PCI %02x:%02x\n",

			dev->board,

			dev->name,

			dev->pci_bus,
@@ -588,14 +592,16 @@ int cx23885_dvb_register(struct cx23885_tsport *port) 


		/* dvb stuff */

		/* We have to init the queue for each frontend on a port. */

		printk("%s: cx23885 based dvb card\n", dev->name);

		videobuf_queue_sg_init(&fe0->dvb.dvbq, &dvb_qops, &dev->pci->dev, &port->slock,

		printk(KERN_INFO "%s: cx23885 based dvb card\n", dev->name);

		videobuf_queue_sg_init(&fe0->dvb.dvbq, &dvb_qops,

			    &dev->pci->dev, &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", __func__, err);

		printk(KERN_ERR "%s() dvb_register failed err = %d\n",

			__func__, err);



	return err;

}
@@ -618,9 +624,3 @@ 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

*/

drivers/media/video/cx23885/cx23885-i2c.c

+24 −23
Original line number Diff line number Diff line
@@ -151,9 +151,9 @@ static int i2c_sendbytes(struct i2c_adapter *i2c_adap, 
		if (retval == 0)

			goto eio;

		if (i2c_debug) {

			printk(" %02x", msg->buf[cnt]);

			dprintk(1, " %02x", msg->buf[cnt]);

			if (!(ctrl & I2C_NOSTOP))

				printk(" >\n");

				dprintk(1, " >\n");

		}

	}

	return msg->len;
@@ -162,7 +162,7 @@ static int i2c_sendbytes(struct i2c_adapter *i2c_adap, 
	retval = -EIO;

 err:

	if (i2c_debug)

		printk(" ERR: %d\n", retval);

		printk(KERN_ERR " ERR: %d\n", retval);

	return retval;

}
@@ -194,9 +194,9 @@ static int i2c_readbytes(struct i2c_adapter *i2c_adap, 


	if (i2c_debug) {

		if (joined)

			printk(" R");

			dprintk(1, " R");

		else

			printk(" <R %02x", (msg->addr << 1) + 1);

			dprintk(1, " <R %02x", (msg->addr << 1) + 1);

	}



	for (cnt = 0; cnt < msg->len; cnt++) {
@@ -216,9 +216,9 @@ static int i2c_readbytes(struct i2c_adapter *i2c_adap, 
			goto eio;

		msg->buf[cnt] = cx_read(bus->reg_rdata) & 0xff;

		if (i2c_debug) {

			printk(" %02x", msg->buf[cnt]);

			dprintk(1, " %02x", msg->buf[cnt]);

			if (!(ctrl & I2C_NOSTOP))

				printk(" >\n");

				dprintk(1, " >\n");

		}

	}

	return msg->len;
@@ -227,7 +227,7 @@ static int i2c_readbytes(struct i2c_adapter *i2c_adap, 
	retval = -EIO;

 err:

	if (i2c_debug)

		printk(" ERR: %d\n", retval);

		printk(KERN_ERR " ERR: %d\n", retval);

	return retval;

}
@@ -376,7 +376,7 @@ static void do_i2c_scan(char *name, struct i2c_client *c) 
		rc = i2c_master_recv(c, &buf, 0);

		if (rc < 0)

			continue;

		printk("%s: i2c scan: found device @ 0x%x  [%s]\n",

		printk(KERN_INFO "%s: i2c scan: found device @ 0x%x  [%s]\n",

		       name, i << 1, i2c_devs[i] ? i2c_devs[i] : "???");

	}

}
@@ -408,11 +408,12 @@ int cx23885_i2c_register(struct cx23885_i2c *bus) 
	bus->i2c_client.adapter = &bus->i2c_adap;



	if (0 == bus->i2c_rc) {

		printk("%s: i2c bus %d registered\n", dev->name, bus->nr);

		dprintk(1, "%s: i2c bus %d registered\n", dev->name, bus->nr);

		if (i2c_scan)

			do_i2c_scan(dev->name, &bus->i2c_client);

	} else

		printk("%s: i2c bus %d register FAILED\n", dev->name, bus->nr);

		printk(KERN_WARNING "%s: i2c bus %d register FAILED\n",

			dev->name, bus->nr);



	return bus->i2c_rc;

}

drivers/media/video/cx23885/cx23885-video.c

+13 −12
Original line number Diff line number Diff line
@@ -285,11 +285,10 @@ static void cx23885_video_wakeup(struct cx23885_dev *dev, 
		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(KERN_ERR "%s: %d buffers handled (should be 1)\n",

			__func__, bc);
@@ -379,12 +378,12 @@ static int res_get(struct cx23885_dev *dev, struct cx23885_fh *fh, 


static int res_check(struct cx23885_fh *fh, unsigned int bit)

{

	return (fh->resources & bit);

	return fh->resources & bit;

}



static int res_locked(struct cx23885_dev *dev, unsigned int bit)

{

	return (dev->resources & bit);

	return dev->resources & bit;

}



static void res_free(struct cx23885_dev *dev, struct cx23885_fh *fh,
@@ -887,14 +886,16 @@ static int video_mmap(struct file *file, struct vm_area_struct *vma) 
/* ------------------------------------------------------------------ */

/* VIDEO CTRL IOCTLS                                                  */



static int cx23885_get_control(struct cx23885_dev *dev, struct v4l2_control *ctl)

static int cx23885_get_control(struct cx23885_dev *dev,

	struct v4l2_control *ctl)

{

	dprintk(1, "%s() calling cx25840(VIDIOC_G_CTRL)\n", __func__);

	cx23885_call_i2c_clients(&dev->i2c_bus[2], VIDIOC_G_CTRL, ctl);

	return 0;

}



static int cx23885_set_control(struct cx23885_dev *dev, struct v4l2_control *ctl)

static int cx23885_set_control(struct cx23885_dev *dev,

	struct v4l2_control *ctl)

{

	dprintk(1, "%s() calling cx25840(VIDIOC_S_CTRL)"

		" (disabled - no action)\n", __func__);
@@ -1073,29 +1074,29 @@ static int vidioc_reqbufs(struct file *file, void *priv, 
	struct v4l2_requestbuffers *p)

{

	struct cx23885_fh *fh = priv;

	return (videobuf_reqbufs(get_queue(fh), p));

	return videobuf_reqbufs(get_queue(fh), p);

}



static int vidioc_querybuf(struct file *file, void *priv,

	struct v4l2_buffer *p)

{

	struct cx23885_fh *fh = priv;

	return (videobuf_querybuf(get_queue(fh), p));

	return videobuf_querybuf(get_queue(fh), p);

}



static int vidioc_qbuf(struct file *file, void *priv,

	struct v4l2_buffer *p)

{

	struct cx23885_fh *fh = priv;

	return (videobuf_qbuf(get_queue(fh), p));

	return videobuf_qbuf(get_queue(fh), p);

}



static int vidioc_dqbuf(struct file *file, void *priv,

	struct v4l2_buffer *p)

{

	struct cx23885_fh *fh = priv;

	return (videobuf_dqbuf(get_queue(fh), p,

				file->f_flags & O_NONBLOCK));

	return videobuf_dqbuf(get_queue(fh), p,

				file->f_flags & O_NONBLOCK);

}



static int vidioc_streamon(struct file *file, void *priv,