diff options
| author | Michael Hunold <devnull@localhost> | 2004-10-26 11:19:29 +0000 |
|---|---|---|
| committer | Michael Hunold <devnull@localhost> | 2004-10-26 11:19:29 +0000 |
| commit | d75b61b118916c27d9becd0b84119a190053b1eb (patch) | |
| tree | f223b863d6e12ceaba080405f4e75a8e7c07a1dd /linux | |
| parent | ef86fead3f4f9b4833cb64e979eb6282f989e88e (diff) | |
| download | mediapointer-dvb-s2-d75b61b118916c27d9becd0b84119a190053b1eb.tar.gz mediapointer-dvb-s2-d75b61b118916c27d9becd0b84119a190053b1eb.tar.bz2 | |
- clean up io_mem mess
Diffstat (limited to 'linux')
| -rw-r--r-- | linux/drivers/media/dvb/b2c2/skystar2.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/linux/drivers/media/dvb/b2c2/skystar2.c b/linux/drivers/media/dvb/b2c2/skystar2.c index c8c45d307..3c39ccbf7 100644 --- a/linux/drivers/media/dvb/b2c2/skystar2.c +++ b/linux/drivers/media/dvb/b2c2/skystar2.c @@ -86,7 +86,7 @@ struct adapter { u32 pid_filter_max; u32 mac_filter_max; u32 irq; - unsigned long io_mem; + void __iomem *io_mem; unsigned long io_port; u8 mac_addr[8]; u32 dw_sram_type; @@ -1769,8 +1769,8 @@ static void free_adapter_object(struct adapter *adapter) free_dma_queue(adapter); - if (adapter->io_mem != 0) - iounmap((void *) adapter->io_mem); + if (adapter->io_mem) + iounmap(adapter->io_mem); if (adapter != 0) kfree(adapter); @@ -1804,15 +1804,15 @@ static int claim_adapter(struct adapter *adapter) adapter->io_port = pdev->resource[1].start; - adapter->io_mem = (unsigned long) ioremap(pdev->resource[0].start, 0x800); + adapter->io_mem = ioremap(pdev->resource[0].start, 0x800); - if (adapter->io_mem == 0) { + if (!adapter->io_mem) { dprintk("%s: can not map io memory\n", __FUNCTION__); return 2; } - dprintk("%s: io memory maped at %lx\n", __FUNCTION__, adapter->io_mem); + dprintk("%s: io memory maped at %p\n", __FUNCTION__, adapter->io_mem); return 1; } |