Commit 33c79630 authored by Manu Abraham's avatar Manu Abraham Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (13714): [MB86A16] FIX/Code simplification: use hwconfig->ts_size instead of ts_size 



thanks to Marko Ristola for pointing it out

Signed-off-by: default avatarManu Abraham <manu@linuxtv.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 1fa1f107

drivers/media/dvb/mantis/mantis_common.h

+0 −1
Original line number Diff line number Diff line
@@ -92,7 +92,6 @@ struct mantis_pci { 
	u8			revision;



	unsigned int		num;

	u16			ts_size;



	/*	RISC Core		*/

	u32			finished_block;

drivers/media/dvb/mantis/mantis_dma.c

+2 −2
Original line number Diff line number Diff line
@@ -190,7 +190,6 @@ void mantis_dma_start(struct mantis_pci *mantis) 


	mantis_risc_program(mantis);

	mmwrite(cpu_to_le32(mantis->risc_dma), MANTIS_RISC_START);

//	mmwrite(MANTIS_GPIF_RDWRN, MANTIS_GPIF_ADDR);

	mmwrite(mmread(MANTIS_GPIF_ADDR) | MANTIS_GPIF_RDWRN, MANTIS_GPIF_ADDR);



	mmwrite(0, MANTIS_DMA_CTL);
@@ -227,12 +226,13 @@ void mantis_dma_stop(struct mantis_pci *mantis) 
void mantis_dma_xfer(unsigned long data)

{

	struct mantis_pci *mantis = (struct mantis_pci *) data;

	struct mantis_hwconfig *config = mantis->hwconfig;



	while (mantis->last_block != mantis->finished_block) {

		dprintk(verbose, MANTIS_DEBUG, 1, "last block=[%d] finished block=[%d]",

			mantis->last_block, mantis->finished_block);



		(mantis->ts_size ? dvb_dmx_swfilter_204: dvb_dmx_swfilter)

		(config->ts_size ? dvb_dmx_swfilter_204: dvb_dmx_swfilter)

		(&mantis->demux, &mantis->buf_cpu[mantis->last_block * MANTIS_BLOCK_BYTES], MANTIS_BLOCK_BYTES);

		mantis->last_block = (mantis->last_block + 1) % MANTIS_BLOCK_COUNT;

	}

drivers/media/dvb/mantis/mantis_dvb.c

+0 −1
Original line number Diff line number Diff line
@@ -142,7 +142,6 @@ int __devinit mantis_dvb_init(struct mantis_pci *mantis) 
	mantis->demux.start_feed = mantis_dvb_start_feed;

	mantis->demux.stop_feed = mantis_dvb_stop_feed;

	mantis->demux.write_to_decoder = NULL;

	mantis->ts_size = 1; //188

	dprintk(verbose, MANTIS_DEBUG, 1, "dvb_dmx_init");

	if ((result = dvb_dmx_init(&mantis->demux)) < 0) {

		dprintk(verbose, MANTIS_ERROR, 1,