Sfoglia il codice sorgente

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>
David S. Miller 7 anni fa
parent
commit
28e9c1d530

+ 2 - 1
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);

+ 3 - 3
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;