summaryrefslogtreecommitdiff
path: root/drivers/net
diff options
context:
space:
mode:
authorJoe Hershberger <joe.hershberger@ni.com>2012-05-21 14:45:25 +0000
committerJoe Hershberger <joe.hershberger@ni.com>2012-05-22 10:18:16 -0500
commitbccbe619b1138c801a4a789dc30c265c7a34dbc5 (patch)
tree085bc218999a145294e224e14286f8f4713d9b27 /drivers/net
parent6e758ef56eb82200604a5e89509b66c6590c00ce (diff)
downloadu-boot-imx-bccbe619b1138c801a4a789dc30c265c7a34dbc5.zip
u-boot-imx-bccbe619b1138c801a4a789dc30c265c7a34dbc5.tar.gz
u-boot-imx-bccbe619b1138c801a4a789dc30c265c7a34dbc5.tar.bz2
drivers/net/eepro100.c: Fix compile warning
Fix this: eepro100.c: In function 'eepro100_initialize': eepro100.c:464:13: warning: assignment from incompatible pointer type eepro100.c: In function 'eepro100_recv': eepro100.c:694:4: 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 u8 *' The use of a descriptor like this may mean DMA will update this at will Beware this may be a source of trouble on some boards Signed-off-by: Joe Hershberger <joe.hershberger@ni.com> Cc: Joe Hershberger <joe.hershberger@gmail.com>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/eepro100.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/net/eepro100.c b/drivers/net/eepro100.c
index 07ec34c..d2c8277 100644
--- a/drivers/net/eepro100.c
+++ b/drivers/net/eepro100.c
@@ -242,8 +242,7 @@ static void purge_tx_ring (struct eth_device *dev);
static void read_hw_addr (struct eth_device *dev, bd_t * bis);
static int eepro100_init (struct eth_device *dev, bd_t * bis);
-static int eepro100_send (struct eth_device *dev, volatile void *packet,
- int length);
+static int eepro100_send(struct eth_device *dev, void *packet, int length);
static int eepro100_recv (struct eth_device *dev);
static void eepro100_halt (struct eth_device *dev);
@@ -608,7 +607,7 @@ static int eepro100_init (struct eth_device *dev, bd_t * bis)
return status;
}
-static int eepro100_send (struct eth_device *dev, volatile void *packet, int length)
+static int eepro100_send(struct eth_device *dev, void *packet, int length)
{
int i, status = -1;
int tx_cur;
@@ -691,7 +690,7 @@ static int eepro100_recv (struct eth_device *dev)
/* Pass the packet up to the protocol
* layers.
*/
- NetReceive (rx_ring[rx_next].data, length);
+ NetReceive((u8 *)rx_ring[rx_next].data, length);
} else {
/* There was an error.
*/