diff options
| author | Andrew Morton <akpm@osdl.org> | 2005-09-12 23:21:55 -0700 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-09-14 08:03:34 -0400 |
| commit | 6b4d617d154a1cf51015f7d3db158835d2235768 (patch) | |
| tree | 747385388a34e3f0678e8a7067042e9538177a86 /drivers | |
| parent | 9734c3fc89e5e2b5c132ed47fe096711eff2c092 (diff) | |
| download | talos-op-linux-6b4d617d154a1cf51015f7d3db158835d2235768.tar.gz talos-op-linux-6b4d617d154a1cf51015f7d3db158835d2235768.zip | |
[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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/s2io.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c index c829e6a2e8a6..dd451e099a4c 100644 --- a/drivers/net/s2io.c +++ b/drivers/net/s2io.c @@ -428,7 +428,7 @@ static int init_shared_mem(struct s2io_nic *nic) DBG_PRINT(INIT_DBG, "%s: Zero DMA address for TxDL. ", dev->name); DBG_PRINT(INIT_DBG, - "Virtual address %llx\n", (u64)tmp_v); + "Virtual address %p\n", tmp_v); tmp_v = pci_alloc_consistent(nic->pdev, PAGE_SIZE, &tmp_p); if (!tmp_v) { @@ -657,9 +657,10 @@ static void free_shared_mem(struct s2io_nic *nic) mac_control->zerodma_virt_addr, (dma_addr_t)0); DBG_PRINT(INIT_DBG, - "%s: Freeing TxDL with zero DMA addr. ", dev->name); - DBG_PRINT(INIT_DBG, "Virtual address %llx\n", - (u64)(mac_control->zerodma_virt_addr)); + "%s: Freeing TxDL with zero DMA addr. ", + dev->name); + DBG_PRINT(INIT_DBG, "Virtual address %p\n", + mac_control->zerodma_virt_addr); } kfree(mac_control->fifos[i].list_info); } |
