leandrof/u-boot
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drivers/net/mvgbe.c: Fix GCC 4.6 warnings

Browse Source 
Fix:
mvgbe.c: In function 'mvgbe_send':
mvgbe.c:555:2: warning: dereferencing type-punned pointer will
break strict-aliasing rules [-Wstrict-aliasing]
mvgbe.c: In function 'mvgbe_recv':
mvgbe.c:640:2: warning: dereferencing type-punned pointer will
break strict-aliasing rules [-Wstrict-aliasing]

Signed-off-by: Anatolij Gustschin <agust@denx.de>
Cc: Prafulla Wadaskar <prafulla@marvell.com>
Acked-By: Prafulla Wadaskar <prafulla@marvell.com>
This commit is contained in:
Anatolij Gustschin 2011-11-19 08:59:36 +00:00 committed by Wolfgang Denk
parent 7813ca9b66
commit e6e556c16b
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/net/mvgbe.c
View File

@ -531,6 +531,7 @@ static int mvgbe_send(struct eth_device *dev, void *dataptr,
struct mvgbe_txdesc *p_txdesc = dmvgbe->p_txdesc; struct mvgbe_txdesc *p_txdesc = dmvgbe->p_txdesc;
void *p = (void *)dataptr; void *p = (void *)dataptr;
u32 cmd_sts; u32 cmd_sts;
u32 txuq0_reg_addr;
/* Copy buffer if it's misaligned */ /* Copy buffer if it's misaligned */
if ((u32) dataptr & 0x07) { if ((u32) dataptr & 0x07) {
@ -552,7 +553,8 @@ static int mvgbe_send(struct eth_device *dev, void *dataptr,
p_txdesc->byte_cnt = datasize; p_txdesc->byte_cnt = datasize;
/* Set this tc desc as zeroth TXUQ */ /* Set this tc desc as zeroth TXUQ */
MVGBE_REG_WR(regs->tcqdp[TXUQ], (u32) p_txdesc); txuq0_reg_addr = (u32)&regs->tcqdp[TXUQ];
writel((u32) p_txdesc, txuq0_reg_addr);
/* ensure tx desc writes above are performed before we start Tx DMA */ /* ensure tx desc writes above are performed before we start Tx DMA */
isb(); isb();
@ -583,6 +585,7 @@ static int mvgbe_recv(struct eth_device *dev)
struct mvgbe_rxdesc *p_rxdesc_curr = dmvgbe->p_rxdesc_curr; struct mvgbe_rxdesc *p_rxdesc_curr = dmvgbe->p_rxdesc_curr;
u32 cmd_sts; u32 cmd_sts;
u32 timeout = 0; u32 timeout = 0;
u32 rxdesc_curr_addr;
/* wait untill rx packet available or timeout */ /* wait untill rx packet available or timeout */
do { do {
@ -637,8 +640,8 @@ static int mvgbe_recv(struct eth_device *dev)
p_rxdesc_curr->buf_size = PKTSIZE_ALIGN; p_rxdesc_curr->buf_size = PKTSIZE_ALIGN;
p_rxdesc_curr->byte_cnt = 0; p_rxdesc_curr->byte_cnt = 0;
writel((unsigned)p_rxdesc_curr->nxtdesc_p, rxdesc_curr_addr = (u32)&dmvgbe->p_rxdesc_curr;
(u32) &dmvgbe->p_rxdesc_curr); writel((unsigned)p_rxdesc_curr->nxtdesc_p, rxdesc_curr_addr);
return 0; return 0;
} }