diff options
| author | Oliver Endriss <o.endriss@gmx.de> | 2008-06-19 21:56:03 -0400 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-20 06:10:15 -0400 |
| commit | ccb43646ed574ef0d1ab6ddf73283a3c7caa426d (patch) | |
| tree | deb378e2cfec26d3d4ded8ac67e1db68599ef838 | |
| parent | 980b59fb5b4ed4fac91dc57f4e50593faa804f8f (diff) | |
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>
| -rw-r--r-- | drivers/media/dvb/ttpci/av7110.c | 1 | ||||
| -rw-r--r-- | drivers/media/dvb/ttpci/av7110.h | 1 | ||||
| -rw-r--r-- | drivers/media/dvb/ttpci/av7110_hw.h | 3 |
3 files changed, 0 insertions, 5 deletions
diff --git a/drivers/media/dvb/ttpci/av7110.c b/drivers/media/dvb/ttpci/av7110.c index f05d43d8b5cf..6d7b9f6a6c75 100644 --- 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) | |||
| 1198 | if (budget->feeding1) | 1198 | if (budget->feeding1) |
| 1199 | return ++budget->feeding1; | 1199 | return ++budget->feeding1; |
| 1200 | memset(budget->grabbing, 0x00, TS_HEIGHT * TS_WIDTH); | 1200 | memset(budget->grabbing, 0x00, TS_HEIGHT * TS_WIDTH); |
| 1201 | budget->tsf = 0xff; | ||
| 1202 | budget->ttbp = 0; | 1201 | budget->ttbp = 0; |
| 1203 | SAA7146_IER_ENABLE(budget->dev, MASK_10); /* VPE */ | 1202 | SAA7146_IER_ENABLE(budget->dev, MASK_10); /* VPE */ |
| 1204 | saa7146_write(budget->dev, MC1, (MASK_04 | MASK_20)); /* DMA3 on */ | 1203 | 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 e494e04eeee8..55f23ddcb994 100644 --- a/drivers/media/dvb/ttpci/av7110.h +++ b/drivers/media/dvb/ttpci/av7110.h | |||
| @@ -188,7 +188,6 @@ struct av7110 { | |||
| 188 | struct dvb_net dvb_net1; | 188 | struct dvb_net dvb_net1; |
| 189 | spinlock_t feedlock1; | 189 | spinlock_t feedlock1; |
| 190 | int feeding1; | 190 | int feeding1; |
| 191 | u8 tsf; | ||
| 192 | u32 ttbp; | 191 | u32 ttbp; |
| 193 | unsigned char *grabbing; | 192 | unsigned char *grabbing; |
| 194 | struct saa7146_pgtable pt; | 193 | struct saa7146_pgtable pt; |
diff --git a/drivers/media/dvb/ttpci/av7110_hw.h b/drivers/media/dvb/ttpci/av7110_hw.h index 74d940f75da6..ca99e5c1fc8a 100644 --- a/drivers/media/dvb/ttpci/av7110_hw.h +++ b/drivers/media/dvb/ttpci/av7110_hw.h | |||
| @@ -305,7 +305,6 @@ enum av7110_command_type { | |||
| 305 | #define IRQ_STATE (DPRAM_BASE + 0x0F4) | 305 | #define IRQ_STATE (DPRAM_BASE + 0x0F4) |
| 306 | #define IRQ_STATE_EXT (DPRAM_BASE + 0x0F6) | 306 | #define IRQ_STATE_EXT (DPRAM_BASE + 0x0F6) |
| 307 | #define MSGSTATE (DPRAM_BASE + 0x0F8) | 307 | #define MSGSTATE (DPRAM_BASE + 0x0F8) |
| 308 | #define FILT_STATE (DPRAM_BASE + 0x0FA) | ||
| 309 | #define COMMAND (DPRAM_BASE + 0x0FC) | 308 | #define COMMAND (DPRAM_BASE + 0x0FC) |
| 310 | #define COM_BUFF (DPRAM_BASE + 0x100) | 309 | #define COM_BUFF (DPRAM_BASE + 0x100) |
| 311 | #define COM_BUFF_SIZE 0x20 | 310 | #define COM_BUFF_SIZE 0x20 |
| @@ -332,8 +331,6 @@ enum av7110_command_type { | |||
| 332 | 331 | ||
| 333 | /* firmware status area */ | 332 | /* firmware status area */ |
| 334 | #define STATUS_BASE (DPRAM_BASE + 0x1FC0) | 333 | #define STATUS_BASE (DPRAM_BASE + 0x1FC0) |
| 335 | #define STATUS_SCR (STATUS_BASE + 0x00) | ||
| 336 | #define STATUS_MODES (STATUS_BASE + 0x04) | ||
| 337 | #define STATUS_LOOPS (STATUS_BASE + 0x08) | 334 | #define STATUS_LOOPS (STATUS_BASE + 0x08) |
| 338 | 335 | ||
| 339 | #define STATUS_MPEG_WIDTH (STATUS_BASE + 0x0C) | 336 | #define STATUS_MPEG_WIDTH (STATUS_BASE + 0x0C) |
