drivers/net/tsi108_eth.c: Fix compile warning
authorJoe Hershberger <joe.hershberger@ni.com>
Tue, 22 May 2012 07:56:19 +0000 (07:56 +0000)
committerJoe Hershberger <joe.hershberger@ni.com>
Tue, 22 May 2012 18:41:47 +0000 (13:41 -0500)
Fix this:
tsi108_eth.c: In function 'tsi108_eth_initialize':
tsi108_eth.c:745:13: warning: assignment from incompatible pointer type
tsi108_eth.c: In function 'tsi108_eth_recv':
tsi108_eth.c:989:4: warning: passing argument 1 of 'NetReceive' discards qualifiers from pointer target type

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

index f100ec1a50e8d571236994d73865f399dfcc5722..b2c1be54fe4f9b05cc39a89f2c528e74a0812800 100644 (file)
@@ -433,8 +433,7 @@ static struct dma_descriptor rx_descr_array[NUM_RX_DESC]
 static struct dma_descriptor *rx_descr_current;
 
 static int tsi108_eth_probe (struct eth_device *dev, bd_t * bis);
-static int tsi108_eth_send (struct eth_device *dev,
-                          volatile void *packet, int length);
+static int tsi108_eth_send(struct eth_device *dev, void *packet, int length);
 static int tsi108_eth_recv (struct eth_device *dev);
 static void tsi108_eth_halt (struct eth_device *dev);
 static unsigned int read_phy (unsigned int base,
@@ -872,8 +871,7 @@ static int tsi108_eth_probe (struct eth_device *dev, bd_t * bis)
 /*
  * send a packet
  */
-static int tsi108_eth_send (struct eth_device *dev,
-                          volatile void *packet, int length)
+static int tsi108_eth_send(struct eth_device *dev, void *packet, int length)
 {
        unsigned long base;
        int timeout;
@@ -948,7 +946,7 @@ static int tsi108_eth_recv (struct eth_device *dev)
        unsigned long base;
        int length = 0;
        unsigned long status;
-       volatile uchar *buffer;
+       uchar *buffer;
 
        base = dev->iobase;
 
@@ -983,10 +981,8 @@ static int tsi108_eth_recv (struct eth_device *dev)
                            le32_to_cpu(rx_descr->vlan_byte_count) & 0xFFFF;
 
                        /*** process packet ***/
-                       buffer =
-                           (volatile uchar
-                            *)(le32_to_cpu (rx_descr->start_addr0));
-                       NetReceive (buffer, length);
+                       buffer = (uchar *)(le32_to_cpu(rx_descr->start_addr0));
+                       NetReceive(buffer, length);
 
                        invalidate_dcache_range ((unsigned long)buffer,
                                                (unsigned long)buffer +