[PATCH] s2io warning fixes
drivers/net/s2io.c: In function `init_shared_mem': drivers/net/s2io.c:431: warning: cast from pointer to integer of different size drivers/net/s2io.c: In function `free_shared_mem': drivers/net/s2io.c:662: warning: cast from pointer to integer of different size Cc: "David S. Miller" <davem@davemloft.net> Cc: Jeff Garzik <jgarzik@pobox.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
This commit is contained in:
parent
9734c3fc89
commit
6b4d617d15
1 changed files with 5 additions and 4 deletions
|
@ -428,7 +428,7 @@ static int init_shared_mem(struct s2io_nic *nic)
|
||||||
DBG_PRINT(INIT_DBG,
|
DBG_PRINT(INIT_DBG,
|
||||||
"%s: Zero DMA address for TxDL. ", dev->name);
|
"%s: Zero DMA address for TxDL. ", dev->name);
|
||||||
DBG_PRINT(INIT_DBG,
|
DBG_PRINT(INIT_DBG,
|
||||||
"Virtual address %llx\n", (u64)tmp_v);
|
"Virtual address %p\n", tmp_v);
|
||||||
tmp_v = pci_alloc_consistent(nic->pdev,
|
tmp_v = pci_alloc_consistent(nic->pdev,
|
||||||
PAGE_SIZE, &tmp_p);
|
PAGE_SIZE, &tmp_p);
|
||||||
if (!tmp_v) {
|
if (!tmp_v) {
|
||||||
|
@ -657,9 +657,10 @@ static void free_shared_mem(struct s2io_nic *nic)
|
||||||
mac_control->zerodma_virt_addr,
|
mac_control->zerodma_virt_addr,
|
||||||
(dma_addr_t)0);
|
(dma_addr_t)0);
|
||||||
DBG_PRINT(INIT_DBG,
|
DBG_PRINT(INIT_DBG,
|
||||||
"%s: Freeing TxDL with zero DMA addr. ", dev->name);
|
"%s: Freeing TxDL with zero DMA addr. ",
|
||||||
DBG_PRINT(INIT_DBG, "Virtual address %llx\n",
|
dev->name);
|
||||||
(u64)(mac_control->zerodma_virt_addr));
|
DBG_PRINT(INIT_DBG, "Virtual address %p\n",
|
||||||
|
mac_control->zerodma_virt_addr);
|
||||||
}
|
}
|
||||||
kfree(mac_control->fifos[i].list_info);
|
kfree(mac_control->fifos[i].list_info);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue