V4L/DVB (8072): av7110: Removed some obsolete definitions and one unused variable

Removed some obsolete definitions and one unused variable.

Signed-off-by: Oliver Endriss <o.endriss@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

diff --git a/drivers/media/dvb/ttpci/av7110.c b/drivers/media/dvb/ttpci/av7110.c
index f05d43d8b5cf25cfef2bdc0e866c97080ffca257..6d7b9f6a6c7561929e75b45f5f94b72636039791 100644 (file)
--- a/drivers/media/dvb/ttpci/av7110.c
+++ b/drivers/media/dvb/ttpci/av7110.c
@@ -1198,7 +1198,6 @@ static int start_ts_capture(struct av7110 *budget)
        if (budget->feeding1)
                return ++budget->feeding1;
        memset(budget->grabbing, 0x00, TS_HEIGHT * TS_WIDTH);
-       budget->tsf = 0xff;
        budget->ttbp = 0;
        SAA7146_IER_ENABLE(budget->dev, MASK_10); /* VPE */
        saa7146_write(budget->dev, MC1, (MASK_04 | MASK_20)); /* DMA3 on */

diff --git a/drivers/media/dvb/ttpci/av7110.h b/drivers/media/dvb/ttpci/av7110.h
index e494e04eeee8fb7b8ac2922cbfb8e90d4e0c211c..55f23ddcb994e259fa56fe45f646019bf7e916da 100644 (file)
--- a/drivers/media/dvb/ttpci/av7110.h
+++ b/drivers/media/dvb/ttpci/av7110.h
@@ -188,7 +188,6 @@ struct av7110 {
        struct dvb_net          dvb_net1;
        spinlock_t              feedlock1;
        int                     feeding1;
-       u8                      tsf;
        u32                     ttbp;
        unsigned char           *grabbing;
        struct saa7146_pgtable  pt;

diff --git a/drivers/media/dvb/ttpci/av7110_hw.h b/drivers/media/dvb/ttpci/av7110_hw.h
index 74d940f75da606517e9ed46098b63db8cbc59d59..ca99e5c1fc8abe142e23a7d93552f26d0a57f1f6 100644 (file)
--- a/drivers/media/dvb/ttpci/av7110_hw.h
+++ b/drivers/media/dvb/ttpci/av7110_hw.h
@@ -305,7 +305,6 @@ enum av7110_command_type {
 #define IRQ_STATE      (DPRAM_BASE + 0x0F4)
 #define IRQ_STATE_EXT  (DPRAM_BASE + 0x0F6)
 #define MSGSTATE       (DPRAM_BASE + 0x0F8)
-#define FILT_STATE     (DPRAM_BASE + 0x0FA)
 #define COMMAND                (DPRAM_BASE + 0x0FC)
 #define COM_BUFF       (DPRAM_BASE + 0x100)
 #define COM_BUFF_SIZE  0x20
@@ -332,8 +331,6 @@ enum av7110_command_type {
 
 /* firmware status area */
 #define STATUS_BASE    (DPRAM_BASE + 0x1FC0)
-#define STATUS_SCR     (STATUS_BASE + 0x00)
-#define STATUS_MODES   (STATUS_BASE + 0x04)
 #define STATUS_LOOPS   (STATUS_BASE + 0x08)
 
 #define STATUS_MPEG_WIDTH     (STATUS_BASE + 0x0C)