From: Manu Abraham <abraham.manu@gmail.com>
Date: Thu, 3 Dec 2009 08:44:38 +0000 (-0300)
Subject: V4L/DVB (13714): [MB86A16] FIX/Code simplification: use hwconfig->ts_size instead... 
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=33c79630dd9fb7658dbb885a22e3a8127b16a38a;p=linux-beck.git

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

diff --git a/drivers/media/dvb/mantis/mantis_common.h b/drivers/media/dvb/mantis/mantis_common.h
index e354e7678a57..d4865e4f3468 100644
--- a/drivers/media/dvb/mantis/mantis_common.h
+++ b/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;
diff --git a/drivers/media/dvb/mantis/mantis_dma.c b/drivers/media/dvb/mantis/mantis_dma.c
index e207870fb45d..ea23a89c03fe 100644
--- a/drivers/media/dvb/mantis/mantis_dma.c
+++ b/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;
 	}
diff --git a/drivers/media/dvb/mantis/mantis_dvb.c b/drivers/media/dvb/mantis/mantis_dvb.c
index 319bb8bef4e1..7fe8541b1c51 100644
--- a/drivers/media/dvb/mantis/mantis_dvb.c
+++ b/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,