drivers/net/calxedaxgmac.c: Fix compile warning
authorJoe Hershberger <joe.hershberger@ni.com>
Mon, 21 May 2012 14:45:20 +0000 (14:45 +0000)
committerJoe Hershberger <joe.hershberger@ni.com>
Tue, 22 May 2012 15:18:15 +0000 (10:18 -0500)
Fix this:
calxedaxgmac.c: In function 'xgmac_rx':
calxedaxgmac.c:479:2: warning: passing argument 1 of 'NetReceive' discards qualifiers from pointer target type
include/net.h:438:13: note: expected 'uchar *' but argument is of type 'volatile unsigned char *'
calxedaxgmac.c: In function 'calxedaxgmac_initialize':
calxedaxgmac.c:547:12: warning: assignment from incompatible pointer type

Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
Cc: Joe Hershberger <joe.hershberger@gmail.com>
drivers/net/calxedaxgmac.c

index 00e26c2adc2d543374a5018d5b13ae6036d1ef8d..e3553d68d8627a07f6b7abf4c6d3448337f19025 100644 (file)
@@ -434,7 +434,7 @@ static int xgmac_init(struct eth_device *dev, bd_t * bis)
        return 0;
 }
 
-static int xgmac_tx(struct eth_device *dev, volatile void *packet, int length)
+static int xgmac_tx(struct eth_device *dev, void *packet, int length)
 {
        struct xgmac_regs *regs = (struct xgmac_regs *)dev->iobase;
        struct calxeda_eth_dev *priv = dev->priv;
@@ -442,7 +442,7 @@ static int xgmac_tx(struct eth_device *dev, volatile void *packet, int length)
        struct xgmac_dma_desc *txdesc = &priv->tx_chain[currdesc];
        int timeout;
 
-       desc_set_buf_addr_and_size(txdesc, (void *)packet, length);
+       desc_set_buf_addr_and_size(txdesc, packet, length);
        desc_set_tx_owner(txdesc, TXDESC_FIRST_SEG |
                TXDESC_LAST_SEG | TXDESC_CRC_EN_APPEND);
 
@@ -476,7 +476,7 @@ static int xgmac_rx(struct eth_device *dev)
 
        length = desc_get_rx_frame_len(rxdesc);
 
-       NetReceive((volatile unsigned char *)desc_get_buf_addr(rxdesc), length);
+       NetReceive(desc_get_buf_addr(rxdesc), length);
 
        /* set descriptor back to owned by XGMAC */
        desc_set_rx_owner(rxdesc);