Skip to content

Commit 28e9c1d

Browse files
committed
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 <[email protected]>
2 parents 6174a30 + 60d6e6f commit 28e9c1d

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

drivers/net/ethernet/broadcom/bgmac.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -533,7 +533,8 @@ static void bgmac_dma_tx_ring_free(struct bgmac *bgmac,
533533
int i;
534534

535535
for (i = 0; i < BGMAC_TX_RING_SLOTS; i++) {
536-
int len = dma_desc[i].ctl1 & BGMAC_DESC_CTL1_LEN;
536+
u32 ctl1 = le32_to_cpu(dma_desc[i].ctl1);
537+
unsigned int len = ctl1 & BGMAC_DESC_CTL1_LEN;
537538

538539
slot = &ring->slots[i];
539540
dev_kfree_skb(slot->skb);

drivers/net/ethernet/broadcom/bgmac.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -479,9 +479,9 @@ struct bgmac_rx_header {
479479
struct bgmac {
480480
union {
481481
struct {
482-
void *base;
483-
void *idm_base;
484-
void *nicpm_base;
482+
void __iomem *base;
483+
void __iomem *idm_base;
484+
void __iomem *nicpm_base;
485485
} plat;
486486
struct {
487487
struct bcma_device *core;

0 commit comments

Comments
 (0)