summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoe Hershberger <joe.hershberger@ni.com>2012-05-22 07:56:19 +0000
committerJoe Hershberger <joe.hershberger@ni.com>2012-05-22 13:41:47 -0500
commite5c83f330448f05b8e6eb5d2373d12361c6d9562 (patch)
treeaa45fb9baad80b7e28fb6fdb7e8251ac055c2594
parent86f3cded06e0ec387ac85a91f760ca479597042d (diff)
downloadtalos-obmc-uboot-e5c83f330448f05b8e6eb5d2373d12361c6d9562.tar.gz
talos-obmc-uboot-e5c83f330448f05b8e6eb5d2373d12361c6d9562.zip
drivers/net/tsi108_eth.c: Fix compile warning
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>
-rw-r--r--drivers/net/tsi108_eth.c14
1 files changed, 5 insertions, 9 deletions
diff --git a/drivers/net/tsi108_eth.c b/drivers/net/tsi108_eth.c
index f100ec1a50..b2c1be54fe 100644
--- a/drivers/net/tsi108_eth.c
+++ b/drivers/net/tsi108_eth.c
@@ -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 +
OpenPOWER on IntegriCloud