[U-Boot] [PATCH] drivers/net/xilinx_ll_temac.c: Fix compile warning
Fix this: xilinx_ll_temac.c: In function 'xilinx_ll_temac_initialize': xilinx_ll_temac.c:332: warning: assignment from incompatible pointer type xilinx_ll_temac.c:340: warning: assignment from incompatible pointer type
Signed-off-by: Stephan Linz linz@li-pro.net --- drivers/net/xilinx_ll_temac_fifo.c | 3 +-- drivers/net/xilinx_ll_temac_fifo.h | 3 +-- drivers/net/xilinx_ll_temac_sdma.c | 3 +-- drivers/net/xilinx_ll_temac_sdma.h | 3 +-- 4 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/drivers/net/xilinx_ll_temac_fifo.c b/drivers/net/xilinx_ll_temac_fifo.c index 3ff0f34..d7fd989 100644 --- a/drivers/net/xilinx_ll_temac_fifo.c +++ b/drivers/net/xilinx_ll_temac_fifo.c @@ -102,8 +102,7 @@ int ll_temac_recv_fifo(struct eth_device *dev) return 0; }
-int ll_temac_send_fifo(struct eth_device *dev, volatile void *packet, - int length) +int ll_temac_send_fifo(struct eth_device *dev, void *packet, int length) { int i; u32 *buf = (u32 *)packet; diff --git a/drivers/net/xilinx_ll_temac_fifo.h b/drivers/net/xilinx_ll_temac_fifo.h index f0d6e68..e5b4be9 100644 --- a/drivers/net/xilinx_ll_temac_fifo.h +++ b/drivers/net/xilinx_ll_temac_fifo.h @@ -116,7 +116,6 @@ int ll_temac_reset_fifo(struct eth_device *dev); int ll_temac_recv_fifo(struct eth_device *dev);
/* send buffered data to FIFO */ -int ll_temac_send_fifo(struct eth_device *dev, volatile void *packet, - int length); +int ll_temac_send_fifo(struct eth_device *dev, void *packet, int length);
#endif /* _XILINX_LL_TEMAC_FIFO_ */ diff --git a/drivers/net/xilinx_ll_temac_sdma.c b/drivers/net/xilinx_ll_temac_sdma.c index 621d100..8637a6b 100644 --- a/drivers/net/xilinx_ll_temac_sdma.c +++ b/drivers/net/xilinx_ll_temac_sdma.c @@ -324,8 +324,7 @@ int ll_temac_recv_sdma(struct eth_device *dev) return 0; }
-int ll_temac_send_sdma(struct eth_device *dev, volatile void *packet, - int length) +int ll_temac_send_sdma(struct eth_device *dev, void *packet, int length) { unsigned timeout = 50; /* 1usec * 50 = 50usec */ struct cdmac_bd *tx_dp = &cdmac_bd.tx[tx_idx]; diff --git a/drivers/net/xilinx_ll_temac_sdma.h b/drivers/net/xilinx_ll_temac_sdma.h index 51e258d..db00a57 100644 --- a/drivers/net/xilinx_ll_temac_sdma.h +++ b/drivers/net/xilinx_ll_temac_sdma.h @@ -275,7 +275,6 @@ int ll_temac_reset_sdma(struct eth_device *dev); int ll_temac_recv_sdma(struct eth_device *dev);
/* send buffered data to SDMA */ -int ll_temac_send_sdma(struct eth_device *dev, volatile void *packet, - int length); +int ll_temac_send_sdma(struct eth_device *dev, void *packet, int length);
#endif /* _XILINX_LL_TEMAC_SDMA_ */
Fix this: xilinx_emaclite.c: In function 'xilinx_emaclite_initialize': xilinx_emaclite.c:371: warning: assignment from incompatible pointer type
Signed-off-by: Stephan Linz linz@li-pro.net --- drivers/net/xilinx_emaclite.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/net/xilinx_emaclite.c b/drivers/net/xilinx_emaclite.c index 9791b9a..d5bd737 100644 --- a/drivers/net/xilinx_emaclite.c +++ b/drivers/net/xilinx_emaclite.c @@ -199,7 +199,7 @@ static int xemaclite_txbufferavailable(struct eth_device *dev) return !(txpingbusy && txpongbusy); }
-static int emaclite_send(struct eth_device *dev, volatile void *ptr, int len) +static int emaclite_send(struct eth_device *dev, void *ptr, int len) { u32 reg; u32 baseaddress; @@ -240,7 +240,7 @@ static int emaclite_send(struct eth_device *dev, volatile void *ptr, int len)
debug("Send packet from 0x%x\n", baseaddress); /* Write the frame to the buffer */ - xemaclite_alignedwrite((void *) ptr, baseaddress, len); + xemaclite_alignedwrite(ptr, baseaddress, len); out_be32 (baseaddress + XEL_TPLR_OFFSET,(len & (XEL_TPLR_LENGTH_MASK_HI | XEL_TPLR_LENGTH_MASK_LO))); reg = in_be32 (baseaddress + XEL_TSR_OFFSET); @@ -261,7 +261,7 @@ static int emaclite_send(struct eth_device *dev, volatile void *ptr, int len) & XEL_TSR_XMIT_ACTIVE_MASK) == 0)) { debug("Send packet from 0x%x\n", baseaddress); /* Write the frame to the buffer */ - xemaclite_alignedwrite((void *) ptr, baseaddress, len); + xemaclite_alignedwrite(ptr, baseaddress, len); out_be32 (baseaddress + XEL_TPLR_OFFSET, (len & (XEL_TPLR_LENGTH_MASK_HI | XEL_TPLR_LENGTH_MASK_LO)));
On Tue, May 22, 2012 at 5:18 PM, Stephan Linz linz@li-pro.net wrote:
Fix this: xilinx_emaclite.c: In function 'xilinx_emaclite_initialize': xilinx_emaclite.c:371: warning: assignment from incompatible pointer type
Signed-off-by: Stephan Linz linz@li-pro.net
Applied, thanks.
-Joe
Fix this: xilinx_axi_emac.c: In function 'xilinx_axiemac_initialize': xilinx_axi_emac.c:646: warning: assignment from incompatible pointer type
Signed-off-by: Stephan Linz linz@li-pro.net --- drivers/net/xilinx_axi_emac.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/net/xilinx_axi_emac.c b/drivers/net/xilinx_axi_emac.c index 82e254b..7854a04 100644 --- a/drivers/net/xilinx_axi_emac.c +++ b/drivers/net/xilinx_axi_emac.c @@ -468,7 +468,7 @@ static int axiemac_init(struct eth_device *dev, bd_t * bis) return 0; }
-static int axiemac_send(struct eth_device *dev, volatile void *ptr, int len) +static int axiemac_send(struct eth_device *dev, void *ptr, int len) { struct axidma_priv *priv = dev->priv; u32 timeout;
On Tue, May 22, 2012 at 5:18 PM, Stephan Linz linz@li-pro.net wrote:
Fix this: xilinx_axi_emac.c: In function 'xilinx_axiemac_initialize': xilinx_axi_emac.c:646: warning: assignment from incompatible pointer type
Signed-off-by: Stephan Linz linz@li-pro.net
Applied, thanks.
-Joe
On Tue, May 22, 2012 at 5:18 PM, Stephan Linz linz@li-pro.net wrote:
Fix this: xilinx_ll_temac.c: In function 'xilinx_ll_temac_initialize': xilinx_ll_temac.c:332: warning: assignment from incompatible pointer type xilinx_ll_temac.c:340: warning: assignment from incompatible pointer type
Signed-off-by: Stephan Linz linz@li-pro.net
Applied, thanks.
-Joe
participants (2)
-
Joe Hershberger -
Stephan Linz