net: Kirkwood_egiga.c: fixed build warnings

PATCH New Prafulla Wadaskar 2 participants 2 messages Mar 3, 2010 – Apr 5, 2010 Network drivers

lore

Share & tools

lore

Prafulla Wadaskar

author

2010-03-03 09:57 UTC #0 lore raw

PATCH 1/1 net: Kirkwood_egiga.c: fixed build warnings

This patch fixes following build warnings for kirkwood_egiga.c

kirkwood_egiga.c: In function ?kwgbe_init?:
kirkwood_egiga.c:448: warning: dereferencing type-punned pointer will break strict-aliasing rules kirkwood_egiga.c: In function ?kwgbe_recv?:
kirkwood_egiga.c:609: warning: dereferencing type-punned pointer will break strict-aliasing rules

Signed-off-by Prafulla Wadaskar <[email protected]>

---
 drivers/net/kirkwood_egiga.c |    4 ++--
 drivers/net/kirkwood_egiga.h |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

drivers/net/kirkwood_egiga.c +2 -2

index 2ad7fea..25c72df 100644
@@ -445,7 +445,7 @@ static int kwgbe_init(struct eth_device *dev)
 	KWGBEREG_WR(regs->pmtu, 0);
 
 	/* Assignment of Rx CRDB of given RXUQ */
-	KWGBEREG_WR(regs->rxcdp[RXUQ].rxcdp, (u32) dkwgbe->p_rxdesc_curr);
+	KWGBEREG_WR(regs->rxcdp[RXUQ], (u32) dkwgbe->p_rxdesc_curr);
 	/* Enable port Rx. */
 	KWGBEREG_WR(regs->rqc, (1 << RXUQ));

@@ -606,7 +606,7 @@ static int kwgbe_recv(struct eth_device *dev)
 	p_rxdesc_curr->buf_size = PKTSIZE_ALIGN;
 	p_rxdesc_curr->byte_cnt = 0;
 
-	writel((unsigned)p_rxdesc_curr->nxtdesc_p, &dkwgbe->p_rxdesc_curr);
+	writel((unsigned)p_rxdesc_curr->nxtdesc_p, (u32) &dkwgbe->p_rxdesc_curr);
 
 	return 0;
 }

drivers/net/kirkwood_egiga.h +1 -1

index 16d5214..30c773c 100644
@@ -418,7 +418,7 @@ struct kwgbe_registers {
 	u32 pmtbs;
 	u8 pad14[0x60c - 0x4ec - 4];
 	struct kwgbe_rxcdp rxcdp[7];
-	u32 rxcdp7;
+	struct kwgbe_rxdesc *rxcdp7;
 	u32 rqc;
 	struct kwgbe_txdesc *tcsdp;
 	u8 pad15[0x6c0 - 0x684 - 4];

Signature · 1 line

1.5.3.3

Ben Warren

Applied

2010-04-05 05:20 UTC #1 lore raw

PATCH 1/1 net: Kirkwood_egiga.c: fixed build warnings

Hi Prafulla,

Quoted 10 lines · Prafulla Wadaskar

This patch fixes following build warnings for kirkwood_egiga.c
kirkwood_egiga.c: In function ?kwgbe_init?:
kirkwood_egiga.c:448: warning: dereferencing type-punned pointer will break strict-aliasing rules kirkwood_egiga.c: In function ?kwgbe_recv?:
kirkwood_egiga.c:609: warning: dereferencing type-punned pointer will break strict-aliasing rules
Signed-off-by Prafulla Wadaskar<[email protected]>
---

Applied to net repo.

thanks,
Ben