]> git.kernelconcepts.de Git - karo-tx-uboot.git/commitdiff
drivers/net/xilinx_emaclite.c: Fix compile warning
authorStephan Linz <linz@li-pro.net>
Tue, 22 May 2012 12:18:10 +0000 (12:18 +0000)
committerJoe Hershberger <joe.hershberger@ni.com>
Wed, 23 May 2012 04:17:52 +0000 (23:17 -0500)
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

index 9791b9a534f12f3fb17ea44c581c29e6234d4ec8..d5bd737827acacc82910963750f4c0fc0b015cc5 100644 (file)
@@ -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)));