summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephan Linz <linz@li-pro.net>2012-05-22 12:18:10 +0000
committerJoe Hershberger <joe.hershberger@ni.com>2012-05-22 23:17:52 -0500
commit1ae6b9c4e0889b67e54fe2f3fa6a776ad21cf773 (patch)
treec75c314729e795448795e37dab9a6d443d61e639
parentf22ff1ab09ee906790f08dea2942686c8370ac3d (diff)
downloadtalos-obmc-uboot-1ae6b9c4e0889b67e54fe2f3fa6a776ad21cf773.tar.gz
talos-obmc-uboot-1ae6b9c4e0889b67e54fe2f3fa6a776ad21cf773.zip
drivers/net/xilinx_emaclite.c: Fix compile warning
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>
-rw-r--r--drivers/net/xilinx_emaclite.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/xilinx_emaclite.c b/drivers/net/xilinx_emaclite.c
index 9791b9a534..d5bd737827 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)));
OpenPOWER on IntegriCloud