diff options
| author |   David S. Miller <davem@davemloft.net> | 2018-04-01 22:20:48 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-04-01 22:20:48 -0400 |
| commit | 28e9c1d530b4ccfb2d64ec5b1ebb1f9f893a21e8 (patch) | |
| tree | 809fe704a4c24a4383ce887c0c668d33b7a5851a | |
| parent | route: check sysctl_fib_multipath_use_neigh earlier than hash (diff) | |
| parent | net: bgmac: Fix endian access in bgmac_dma_tx_ring_free() (diff) | |
| download | linux-dev-28e9c1d530b4ccfb2d64ec5b1ebb1f9f893a21e8.tar.xz linux-dev-28e9c1d530b4ccfb2d64ec5b1ebb1f9f893a21e8.zip | |
Merge branch 'net-bgmac-Couple-of-sparse-warnings'
Florian Fainelli says:
====================
net: bgmac: Couple of sparse warnings
This patch series fixes a couple of warnings reported by sparse, should not
cause any functional problems since bgmac is typically used on LE platforms
anyway.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/ethernet/broadcom/bgmac.c | 3 | ||||
| -rw-r--r-- | drivers/net/ethernet/broadcom/bgmac.h | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/drivers/net/ethernet/broadcom/bgmac.c b/drivers/net/ethernet/broadcom/bgmac.c index 2326cc219c46..e6ea8e61f96d 100644 --- a/drivers/net/ethernet/broadcom/bgmac.c +++ b/drivers/net/ethernet/broadcom/bgmac.c @@ -533,7 +533,8 @@ static void bgmac_dma_tx_ring_free(struct bgmac *bgmac, int i; for (i = 0; i < BGMAC_TX_RING_SLOTS; i++) { - int len = dma_desc[i].ctl1 & BGMAC_DESC_CTL1_LEN; + u32 ctl1 = le32_to_cpu(dma_desc[i].ctl1); + unsigned int len = ctl1 & BGMAC_DESC_CTL1_LEN; slot = &ring->slots[i]; dev_kfree_skb(slot->skb); diff --git a/drivers/net/ethernet/broadcom/bgmac.h b/drivers/net/ethernet/broadcom/bgmac.h index 4040d846da8e..40d02fec2747 100644 --- a/drivers/net/ethernet/broadcom/bgmac.h +++ b/drivers/net/ethernet/broadcom/bgmac.h @@ -479,9 +479,9 @@ struct bgmac_rx_header { struct bgmac { union { struct { - void *base; - void *idm_base; - void *nicpm_base; + void __iomem *base; + void __iomem *idm_base; + void __iomem *nicpm_base; } plat; struct { struct bcma_device *core; |