소스 검색

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: Manu Abraham <manu@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Manu Abraham 15 년 전
부모
커밋
33c79630dd
3개의 변경된 파일2개의 추가작업 그리고 4개의 파일을 삭제
  1. 0 1
      drivers/media/dvb/mantis/mantis_common.h
  2. 2 2
      drivers/media/dvb/mantis/mantis_dma.c
  3. 0 1
      drivers/media/dvb/mantis/mantis_dvb.c

+ 0 - 1
drivers/media/dvb/mantis/mantis_common.h

@@ -92,7 +92,6 @@ struct mantis_pci {
 	u8			revision;
 
 	unsigned int		num;
-	u16			ts_size;
 
 	/*	RISC Core		*/
 	u32			finished_block;

+ 2 - 2
drivers/media/dvb/mantis/mantis_dma.c

@@ -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;
 	}

+ 0 - 1
drivers/media/dvb/mantis/mantis_dvb.c

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