diff options
| author | Joe Hershberger <joe.hershberger@ni.com> | 2012-05-21 14:45:20 +0000 |
|---|---|---|
| committer | Joe Hershberger <joe.hershberger@ni.com> | 2012-05-22 10:18:15 -0500 |
| commit | 4ec45248929d9a81ee4c800b02da454f11326dff (patch) | |
| tree | cecedd639856b837b69b9c88ff352ece7063b4c0 | |
| parent | 9577501c6854de9356d8a0fc05e8d29d63a517e2 (diff) | |
| download | u-boot-imx-4ec45248929d9a81ee4c800b02da454f11326dff.zip u-boot-imx-4ec45248929d9a81ee4c800b02da454f11326dff.tar.gz u-boot-imx-4ec45248929d9a81ee4c800b02da454f11326dff.tar.bz2 | |
drivers/net/calxedaxgmac.c: Fix compile warning
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>
| -rw-r--r-- | drivers/net/calxedaxgmac.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/calxedaxgmac.c b/drivers/net/calxedaxgmac.c index 00e26c2..e3553d6 100644 --- a/drivers/net/calxedaxgmac.c +++ b/drivers/net/calxedaxgmac.c @@ -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); |