diff options
| author | Michael Hunold <devnull@localhost> | 2004-11-03 20:35:24 +0000 |
|---|---|---|
| committer | Michael Hunold <devnull@localhost> | 2004-11-03 20:35:24 +0000 |
| commit | 7678825d8d5a0b947ce5a399cb2cffdecbf67658 (patch) | |
| tree | 05989d64b5f5323d59a460e90a3de3a598a5404a /linux | |
| parent | 0a707de8c98c7685e759a503168d1ce7c31f66a7 (diff) | |
| download | mediapointer-dvb-s2-7678825d8d5a0b947ce5a399cb2cffdecbf67658.tar.gz mediapointer-dvb-s2-7678825d8d5a0b947ce5a399cb2cffdecbf67658.tar.bz2 | |
- add __iomem annotations (backport from 2.6.10-rc1-bk9)
Diffstat (limited to 'linux')
| -rw-r--r-- | linux/drivers/media/dvb/b2c2/skystar2.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/linux/drivers/media/dvb/b2c2/skystar2.c b/linux/drivers/media/dvb/b2c2/skystar2.c index 79eeefbf0..0566e9f7d 100644 --- a/linux/drivers/media/dvb/b2c2/skystar2.c +++ b/linux/drivers/media/dvb/b2c2/skystar2.c @@ -88,7 +88,7 @@ struct adapter { u32 pid_filter_max; u32 mac_filter_max; u32 irq; - void *io_mem; + void __iomem *io_mem; unsigned long io_port; u8 mac_addr[8]; u32 dw_sram_type; @@ -125,8 +125,8 @@ struct adapter { int (*fe_sleep)(struct dvb_frontend* fe); }; -#define write_reg_dw(adapter,reg,value) writel(value, (void*) (adapter->io_mem + reg)) -#define read_reg_dw(adapter,reg) readl((void*) (adapter->io_mem + reg)) +#define write_reg_dw(adapter,reg,value) writel(value, adapter->io_mem + reg) +#define read_reg_dw(adapter,reg) readl(adapter->io_mem + reg) static void write_reg_bitfield(struct adapter *adapter, u32 reg, u32 zeromask, u32 orvalue) { @@ -1592,7 +1592,7 @@ static void interrupt_service_dma1(struct adapter *adapter) u8 gb_tmp_buffer[188]; u8 *pb_dma_buf_cur_pos; - n_cur_dma_counter = readl((void*) (adapter->io_mem + 0x008)) - adapter->dmaq1.bus_addr; + n_cur_dma_counter = readl(adapter->io_mem + 0x008) - adapter->dmaq1.bus_addr; n_cur_dma_counter = (n_cur_dma_counter / dw_default_packet_size) * dw_default_packet_size; if ((n_cur_dma_counter < 0) || (n_cur_dma_counter > adapter->dmaq1.buffer_size)) { |