Commit ea43a590 authored by Moritz Fischer's avatar Moritz Fischer Committed by David S. Miller

net: nixge: Address compiler warnings when building for i386

Address compiler warning reported by kbuild autobuilders
when building for i386 as a result of dma_addr_t size on
different architectures.

warning: cast to pointer from integer of different size
	[-Wint-to-pointer-cast]

Fixes: 7e8d5755 ("net: nixge: Add support for 64-bit platforms")
Signed-off-by: default avatarMoritz Fischer <mdf@kernel.org>
Cc: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 789762ce
...@@ -127,8 +127,8 @@ struct nixge_hw_dma_bd { ...@@ -127,8 +127,8 @@ struct nixge_hw_dma_bd {
#ifdef CONFIG_PHYS_ADDR_T_64BIT #ifdef CONFIG_PHYS_ADDR_T_64BIT
#define nixge_hw_dma_bd_set_addr(bd, field, addr) \ #define nixge_hw_dma_bd_set_addr(bd, field, addr) \
do { \ do { \
(bd)->field##_lo = lower_32_bits(((u64)addr)); \ (bd)->field##_lo = lower_32_bits((addr)); \
(bd)->field##_hi = upper_32_bits(((u64)addr)); \ (bd)->field##_hi = upper_32_bits((addr)); \
} while (0) } while (0)
#else #else
#define nixge_hw_dma_bd_set_addr(bd, field, addr) \ #define nixge_hw_dma_bd_set_addr(bd, field, addr) \
...@@ -251,7 +251,7 @@ static void nixge_hw_dma_bd_release(struct net_device *ndev) ...@@ -251,7 +251,7 @@ static void nixge_hw_dma_bd_release(struct net_device *ndev)
NIXGE_MAX_JUMBO_FRAME_SIZE, NIXGE_MAX_JUMBO_FRAME_SIZE,
DMA_FROM_DEVICE); DMA_FROM_DEVICE);
skb = (struct sk_buff *) skb = (struct sk_buff *)(uintptr_t)
nixge_hw_dma_bd_get_addr(&priv->rx_bd_v[i], nixge_hw_dma_bd_get_addr(&priv->rx_bd_v[i],
sw_id_offset); sw_id_offset);
dev_kfree_skb(skb); dev_kfree_skb(skb);
...@@ -323,7 +323,7 @@ static int nixge_hw_dma_bd_init(struct net_device *ndev) ...@@ -323,7 +323,7 @@ static int nixge_hw_dma_bd_init(struct net_device *ndev)
if (!skb) if (!skb)
goto out; goto out;
nixge_hw_dma_bd_set_offset(&priv->rx_bd_v[i], skb); nixge_hw_dma_bd_set_offset(&priv->rx_bd_v[i], (uintptr_t)skb);
phys = dma_map_single(ndev->dev.parent, skb->data, phys = dma_map_single(ndev->dev.parent, skb->data,
NIXGE_MAX_JUMBO_FRAME_SIZE, NIXGE_MAX_JUMBO_FRAME_SIZE,
DMA_FROM_DEVICE); DMA_FROM_DEVICE);
...@@ -601,8 +601,8 @@ static int nixge_recv(struct net_device *ndev, int budget) ...@@ -601,8 +601,8 @@ static int nixge_recv(struct net_device *ndev, int budget)
tail_p = priv->rx_bd_p + sizeof(*priv->rx_bd_v) * tail_p = priv->rx_bd_p + sizeof(*priv->rx_bd_v) *
priv->rx_bd_ci; priv->rx_bd_ci;
skb = (struct sk_buff *)nixge_hw_dma_bd_get_addr(cur_p, skb = (struct sk_buff *)(uintptr_t)
sw_id_offset); nixge_hw_dma_bd_get_addr(cur_p, sw_id_offset);
length = cur_p->status & XAXIDMA_BD_STS_ACTUAL_LEN_MASK; length = cur_p->status & XAXIDMA_BD_STS_ACTUAL_LEN_MASK;
if (length > NIXGE_MAX_JUMBO_FRAME_SIZE) if (length > NIXGE_MAX_JUMBO_FRAME_SIZE)
...@@ -643,7 +643,7 @@ static int nixge_recv(struct net_device *ndev, int budget) ...@@ -643,7 +643,7 @@ static int nixge_recv(struct net_device *ndev, int budget)
nixge_hw_dma_bd_set_phys(cur_p, cur_phys); nixge_hw_dma_bd_set_phys(cur_p, cur_phys);
cur_p->cntrl = NIXGE_MAX_JUMBO_FRAME_SIZE; cur_p->cntrl = NIXGE_MAX_JUMBO_FRAME_SIZE;
cur_p->status = 0; cur_p->status = 0;
nixge_hw_dma_bd_set_offset(cur_p, new_skb); nixge_hw_dma_bd_set_offset(cur_p, (uintptr_t)new_skb);
++priv->rx_bd_ci; ++priv->rx_bd_ci;
priv->rx_bd_ci %= RX_BD_NUM; priv->rx_bd_ci %= RX_BD_NUM;
......
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