drivers/net/xilinx_ll_temac.c: Fix compile warning
authorStephan Linz <linz@li-pro.net>
Tue, 22 May 2012 12:18:09 +0000 (12:18 +0000)
committerJoe Hershberger <joe.hershberger@ni.com>
Wed, 23 May 2012 04:17:52 +0000 (23:17 -0500)
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>
drivers/net/xilinx_ll_temac_fifo.c
drivers/net/xilinx_ll_temac_fifo.h
drivers/net/xilinx_ll_temac_sdma.c
drivers/net/xilinx_ll_temac_sdma.h

index 3ff0f347ed46277dbcd614966d369f4164a60811..d7fd989cd41214e6dceb64b61a451fe17b05a4ff 100644 (file)
@@ -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;
index f0d6e6823c569814f2a0cbdb7fd78ff5b9769079..e5b4be9e6c388d5ff7dc5933e069025a485677dd 100644 (file)
@@ -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_ */
index 621d100f290fbea89337fd2976efd21a0fded2c9..8637a6b1fc6e51ed2e0d2d89c6096cfb68be77db 100644 (file)
@@ -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];
index 51e258d7f5fe3a58465338694b7efb17a554f280..db00a57a167d6b257b7a3a16fb94a203237bfe13 100644 (file)
@@ -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_ */