Commit b1be8f75 authored by Alexander Viro's avatar Alexander Viro Committed by Linus Torvalds

[PATCH] skystar2 iomem annotations

Signed-off-by: default avatarAl Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 82477fa4
...@@ -86,7 +86,7 @@ struct adapter { ...@@ -86,7 +86,7 @@ struct adapter {
u32 pid_filter_max; u32 pid_filter_max;
u32 mac_filter_max; u32 mac_filter_max;
u32 irq; u32 irq;
unsigned long io_mem; void __iomem *io_mem;
unsigned long io_port; unsigned long io_port;
u8 mac_addr[8]; u8 mac_addr[8];
u32 dw_sram_type; u32 dw_sram_type;
...@@ -1770,10 +1770,9 @@ static void free_adapter_object(struct adapter *adapter) ...@@ -1770,10 +1770,9 @@ static void free_adapter_object(struct adapter *adapter)
free_dma_queue(adapter); free_dma_queue(adapter);
if (adapter->io_mem != 0) if (adapter->io_mem)
iounmap((void *) adapter->io_mem); iounmap(adapter->io_mem);
if (adapter != 0)
kfree(adapter); kfree(adapter);
} }
...@@ -1805,15 +1804,15 @@ static int claim_adapter(struct adapter *adapter) ...@@ -1805,15 +1804,15 @@ static int claim_adapter(struct adapter *adapter)
adapter->io_port = pdev->resource[1].start; 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__); dprintk("%s: can not map io memory\n", __FUNCTION__);
return 2; 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; return 1;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment