diff options
author | Mika Westerberg <mika.westerberg@linux.intel.com> | 2012-09-13 20:33:48 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-09-19 15:45:23 -0400 |
commit | 1d3ff76759b70e201e6b379c37ac106c487ff506 (patch) | |
tree | 704f8e1ff4375c3964555f7bfab69a7fe5b99fab /drivers/net/ethernet/i825xx | |
parent | 6b78f16e4bdde3936b11690bdb970be423e07a07 (diff) |
i825xx: znet: fix compiler warnings when building a 64-bit kernel
When building 64-bit kernel with this driver we get following warnings from
the compiler:
drivers/net/ethernet/i825xx/znet.c: In function ‘hardware_init’:
drivers/net/ethernet/i825xx/znet.c:863:29: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
drivers/net/ethernet/i825xx/znet.c:870:29: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
Fix these by calling isa_virt_to_bus() before passing the pointers to
set_dma_addr().
Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/i825xx')
-rw-r--r-- | drivers/net/ethernet/i825xx/znet.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/i825xx/znet.c b/drivers/net/ethernet/i825xx/znet.c index ba4e0cea3506..c9479e081b8a 100644 --- a/drivers/net/ethernet/i825xx/znet.c +++ b/drivers/net/ethernet/i825xx/znet.c | |||
@@ -865,14 +865,14 @@ static void hardware_init(struct net_device *dev) | |||
865 | disable_dma(znet->rx_dma); /* reset by an interrupting task. */ | 865 | disable_dma(znet->rx_dma); /* reset by an interrupting task. */ |
866 | clear_dma_ff(znet->rx_dma); | 866 | clear_dma_ff(znet->rx_dma); |
867 | set_dma_mode(znet->rx_dma, DMA_RX_MODE); | 867 | set_dma_mode(znet->rx_dma, DMA_RX_MODE); |
868 | set_dma_addr(znet->rx_dma, (unsigned int) znet->rx_start); | 868 | set_dma_addr(znet->rx_dma, isa_virt_to_bus(znet->rx_start)); |
869 | set_dma_count(znet->rx_dma, RX_BUF_SIZE); | 869 | set_dma_count(znet->rx_dma, RX_BUF_SIZE); |
870 | enable_dma(znet->rx_dma); | 870 | enable_dma(znet->rx_dma); |
871 | /* Now set up the Tx channel. */ | 871 | /* Now set up the Tx channel. */ |
872 | disable_dma(znet->tx_dma); | 872 | disable_dma(znet->tx_dma); |
873 | clear_dma_ff(znet->tx_dma); | 873 | clear_dma_ff(znet->tx_dma); |
874 | set_dma_mode(znet->tx_dma, DMA_TX_MODE); | 874 | set_dma_mode(znet->tx_dma, DMA_TX_MODE); |
875 | set_dma_addr(znet->tx_dma, (unsigned int) znet->tx_start); | 875 | set_dma_addr(znet->tx_dma, isa_virt_to_bus(znet->tx_start)); |
876 | set_dma_count(znet->tx_dma, znet->tx_buf_len<<1); | 876 | set_dma_count(znet->tx_dma, znet->tx_buf_len<<1); |
877 | enable_dma(znet->tx_dma); | 877 | enable_dma(znet->tx_dma); |
878 | release_dma_lock(flags); | 878 | release_dma_lock(flags); |