diff options
| author | Stephan Linz <linz@li-pro.net> | 2012-05-22 12:18:09 +0000 |
|---|---|---|
| committer | Joe Hershberger <joe.hershberger@ni.com> | 2012-05-22 23:17:52 -0500 |
| commit | f22ff1ab09ee906790f08dea2942686c8370ac3d (patch) | |
| tree | 32ba8805cce6d1db31ccbfefcc2cdd91d636a686 | |
| parent | bb901574922dcf9c97c33bc04fba3ba539397527 (diff) | |
| download | talos-obmc-uboot-f22ff1ab09ee906790f08dea2942686c8370ac3d.tar.gz talos-obmc-uboot-f22ff1ab09ee906790f08dea2942686c8370ac3d.zip | |
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>
| -rw-r--r-- | drivers/net/xilinx_ll_temac_fifo.c | 3 | ||||
| -rw-r--r-- | drivers/net/xilinx_ll_temac_fifo.h | 3 | ||||
| -rw-r--r-- | drivers/net/xilinx_ll_temac_sdma.c | 3 | ||||
| -rw-r--r-- | 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 3ff0f347ed..d7fd989cd4 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 f0d6e6823c..e5b4be9e6c 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 621d100f29..8637a6b1fc 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 51e258d7f5..db00a57a16 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_ */ |
