Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1d3ff767 authored by Mika Westerberg's avatar Mika Westerberg Committed by David S. Miller
Browse files

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: default avatarMika Westerberg <mika.westerberg@linux.intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6b78f16e

drivers/net/ethernet/i825xx/znet.c

+2 −2
Original line number Diff line number Diff line
@@ -865,14 +865,14 @@ static void hardware_init(struct net_device *dev) 
	disable_dma(znet->rx_dma); 		/* reset by an interrupting task. */

	clear_dma_ff(znet->rx_dma);

	set_dma_mode(znet->rx_dma, DMA_RX_MODE);

	set_dma_addr(znet->rx_dma, (unsigned int) znet->rx_start);

	set_dma_addr(znet->rx_dma, isa_virt_to_bus(znet->rx_start));

	set_dma_count(znet->rx_dma, RX_BUF_SIZE);

	enable_dma(znet->rx_dma);

	/* Now set up the Tx channel. */

	disable_dma(znet->tx_dma);

	clear_dma_ff(znet->tx_dma);

	set_dma_mode(znet->tx_dma, DMA_TX_MODE);

	set_dma_addr(znet->tx_dma, (unsigned int) znet->tx_start);

	set_dma_addr(znet->tx_dma, isa_virt_to_bus(znet->tx_start));

	set_dma_count(znet->tx_dma, znet->tx_buf_len<<1);

	enable_dma(znet->tx_dma);

	release_dma_lock(flags);