net: nixge: Address compiler warnings when building for i386
Subsystems (2)
PATCH 1/1 net: nixge: Address compiler warnings when building for i386
Address compiler warnings 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]
--- drivers/net/ethernet/ni/nixge.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
drivers/net/ethernet/ni/nixge.c +7 -7
@@ -127,8 +127,8 @@ struct nixge_hw_dma_bd {#ifdef CONFIG_PHYS_ADDR_T_64BIT #define nixge_hw_dma_bd_set_addr (bd, field, addr) \ do { \ - (bd)->field##_lo = lower_32_bits(((u64)addr)); \ - (bd)->field##_hi = upper_32_bits(((u64)addr)); \ + (bd)->field##_lo = lower_32_bits((addr)); \ + (bd)->field##_hi = upper_32_bits((addr)); \ } while (0)#else #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)NIXGE_MAX_JUMBO_FRAME_SIZE , DMA_FROM_DEVICE); - skb = (struct sk_buff *) + skb = (struct sk_buff *)(uintptr_t )nixge_hw_dma_bd_get_addr (&priv->rx_bd_v[i], sw_id_offset);dev_kfree_skb (skb);
@@ -323,7 +323,7 @@ static int nixge_hw_dma_bd_init(struct net_device *ndev)if (!skb) 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,NIXGE_MAX_JUMBO_FRAME_SIZE ,DMA_FROM_DEVICE );
@@ -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) * priv->rx_bd_ci; - skb = (struct sk_buff *)nixge_hw_dma_bd_get_addr (cur_p, - sw_id_offset); + skb = (struct sk_buff *)(uintptr_t ) +nixge_hw_dma_bd_get_addr (cur_p, sw_id_offset); length = cur_p->status &XAXIDMA_BD_STS_ACTUAL_LEN_MASK ;if (length >NIXGE_MAX_JUMBO_FRAME_SIZE )
@@ -643,7 +643,7 @@ static int nixge_recv(struct net_device *ndev, int budget)nixge_hw_dma_bd_set_phys (cur_p, cur_phys); cur_p->cntrl =NIXGE_MAX_JUMBO_FRAME_SIZE ; 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 %=RX_BD_NUM ;
Signature · 1 line
2.18.0
Quoted 17 lines · Moritz Fischer
Address compiler warnings reported by kbuild autobuilders when building for i386 as a result of
dma_addr_tsize on different architectures.warning: cast to pointer from integer of different size
[-Wint-to-pointer-cast]Signed-off-by Moritz Fischer <[email protected]>--- drivers/net/ethernet/ni/nixge.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)drivers/net/ethernet/ni/nixge.c +0
-0
drivers/net/ethernet/ni/nixge.c struct nixge_hw_dma_bd { · line 132
Quoted 8 lines
drivers/net/ethernet/ni/nixge.c +2
-2@@ -127,8 +127,8 @@ struct nixge_hw_dma_bd {#ifdef CONFIG_PHYS_ADDR_T_64BIT #define nixge_hw_dma_bd_set_addr (bd, field, addr) \ do { \ - (bd)->field##_lo = lower_32_bits(((u64)addr)); \ - (bd)->field##_hi = upper_32_bits(((u64)addr)); \ + (bd)->field##_lo = lower_32_bits((addr)); \ + (bd)->field##_hi = upper_32_bits((addr)); \ } while (0)
Hi Maritz
Maybe turn this into an function. It is small enough it will get inlined. You then gain type checking. Make addr a void *.
drivers/net/ethernet/ni/nixge.c static void nixge_hw_dma_bd_release(struct net_device *ndev) · line 256
Quoted 10 lines
drivers/net/ethernet/ni/nixge.c +1
-1#else #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)NIXGE_MAX_JUMBO_FRAME_SIZE , DMA_FROM_DEVICE); - skb = (struct sk_buff *) + skb = (struct sk_buff *)(uintptr_t )nixge_hw_dma_bd_get_addr (&priv->rx_bd_v[i], sw_id_offset);
How about making nixge_hw_dma_bd_get_addr return a void *. You can assign that to anything without needing a cast.
Andrew