[U-Boot] [PATCH] drivers/net/armada100_fec.c: Fix compile warning

[U-Boot] [PATCH] drivers/net/armada100_fec.c: Fix compile warning

[Joe Hershberger]

Fix this:
armada100_fec.c: In function 'armada100_fec_register':
armada100_fec.c:723:12: warning: assignment from incompatible pointer type

Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
Cc: Joe Hershberger <joe.hershberger@gmail.com>
---
 drivers/net/armada100_fec.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/drivers/net/armada100_fec.c b/drivers/net/armada100_fec.c
index 52be3a7..d318a36 100644
--- a/drivers/net/armada100_fec.c
+++ b/drivers/net/armada100_fec.c
@@ -558,8 +558,7 @@ static void armdfec_halt(struct eth_device *dev)
 	clrbits_le32(&regs->pconf, PCR_EN);
 }
 
-static int armdfec_send(struct eth_device *dev, volatile void *dataptr,
-		    int datasize)
+static int armdfec_send(struct eth_device *dev, void *dataptr, int datasize)
 {
 	struct armdfec_device *darmdfec = to_darmdfec(dev);
 	struct armdfec_reg *regs = darmdfec->regs;
-- 
1.6.0.2

[U-Boot] [PATCH] drivers/net/at91_emac.c: Fix compile warning

[Joe Hershberger]

Fix this:
at91_emac.c: In function 'at91emac_register':
at91_emac.c:524:12: warning: assignment from incompatible pointer type

Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
Cc: Joe Hershberger <joe.hershberger@gmail.com>
---
 drivers/net/at91_emac.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/drivers/net/at91_emac.c b/drivers/net/at91_emac.c
index 483c831..2fa6b68 100644
--- a/drivers/net/at91_emac.c
+++ b/drivers/net/at91_emac.c
@@ -415,8 +415,7 @@ static void at91emac_halt(struct eth_device *netdev)
 	debug_cond(DEBUG_AT91EMAC, "halt MAC\n");
 }
 
-static int at91emac_send(struct eth_device *netdev, volatile void *packet,
-		     int length)
+static int at91emac_send(struct eth_device *netdev, void *packet, int length)
 {
 	at91_emac_t *emac;
 
-- 
1.6.0.2

[U-Boot] [PATCH] drivers/net/calxedaxgmac.c: Fix compile warning

[Joe Hershberger]

Fix this:
calxedaxgmac.c: In function 'xgmac_rx':
calxedaxgmac.c:479:2: 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 unsigned char *'
calxedaxgmac.c: In function 'calxedaxgmac_initialize':
calxedaxgmac.c:547:12: warning: assignment from incompatible pointer type

Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
Cc: Joe Hershberger <joe.hershberger@gmail.com>
---
 drivers/net/calxedaxgmac.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/net/calxedaxgmac.c b/drivers/net/calxedaxgmac.c
index 00e26c2..e3553d6 100644
--- a/drivers/net/calxedaxgmac.c
+++ b/drivers/net/calxedaxgmac.c
@@ -434,7 +434,7 @@ static int xgmac_init(struct eth_device *dev, bd_t * bis)
 	return 0;
 }
 
-static int xgmac_tx(struct eth_device *dev, volatile void *packet, int length)
+static int xgmac_tx(struct eth_device *dev, void *packet, int length)
 {
 	struct xgmac_regs *regs = (struct xgmac_regs *)dev->iobase;
 	struct calxeda_eth_dev *priv = dev->priv;
@@ -442,7 +442,7 @@ static int xgmac_tx(struct eth_device *dev, volatile void *packet, int length)
 	struct xgmac_dma_desc *txdesc = &priv->tx_chain[currdesc];
 	int timeout;
 
-	desc_set_buf_addr_and_size(txdesc, (void *)packet, length);
+	desc_set_buf_addr_and_size(txdesc, packet, length);
 	desc_set_tx_owner(txdesc, TXDESC_FIRST_SEG |
 		TXDESC_LAST_SEG | TXDESC_CRC_EN_APPEND);
 
@@ -476,7 +476,7 @@ static int xgmac_rx(struct eth_device *dev)
 
 	length = desc_get_rx_frame_len(rxdesc);
 
-	NetReceive((volatile unsigned char *)desc_get_buf_addr(rxdesc), length);
+	NetReceive(desc_get_buf_addr(rxdesc), length);
 
 	/* set descriptor back to owned by XGMAC */
 	desc_set_rx_owner(rxdesc);
-- 
1.6.0.2

[U-Boot] [PATCH] drivers/net/cs8900.c: Fix compile warning

[Joe Hershberger]

Fix this:
cs8900.c: In function 'cs8900_initialize':
cs8900.c:326:12: warning: assignment from incompatible pointer type

Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
Cc Joe Hershberger <joe.hershberger@gmail.com>
---
 drivers/net/cs8900.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/drivers/net/cs8900.c b/drivers/net/cs8900.c
index e04a784..6aaa0cf 100644
--- a/drivers/net/cs8900.c
+++ b/drivers/net/cs8900.c
@@ -215,8 +215,7 @@ static int cs8900_recv(struct eth_device *dev)
 }
 
 /* Send a data block via Ethernet. */
-static int cs8900_send(struct eth_device *dev,
-			volatile void *packet, int length)
+static int cs8900_send(struct eth_device *dev, void *packet, int length)
 {
 	volatile u16 *addr;
 	int tmo;
-- 
1.6.0.2

[U-Boot] [PATCH] drivers/net/dc2114x.c: Fix compile warning

[Joe Hershberger]

Fix this:
dc2114x.c: In function 'dc21x4x_initialize':
dc2114x.c:305:15: warning: assignment from incompatible pointer type

Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
Cc: Joe Hershberger <joe.hershberger@gmail.com>
---
 drivers/net/dc2114x.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/dc2114x.c b/drivers/net/dc2114x.c
index 0fb616a..d9fcb5a 100644
--- a/drivers/net/dc2114x.c
+++ b/drivers/net/dc2114x.c
@@ -175,7 +175,7 @@ static void  read_hw_addr(struct eth_device* dev, bd_t * bis);
 static void  send_setup_frame(struct eth_device* dev, bd_t * bis);
 
 static int   dc21x4x_init(struct eth_device* dev, bd_t* bis);
-static int   dc21x4x_send(struct eth_device* dev, volatile void *packet, int length);
+static int   dc21x4x_send(struct eth_device *dev, void *packet, int length);
 static int   dc21x4x_recv(struct eth_device* dev);
 static void  dc21x4x_halt(struct eth_device* dev);
 #ifdef CONFIG_TULIP_SELECT_MEDIA
@@ -390,7 +390,7 @@ static int dc21x4x_init(struct eth_device* dev, bd_t* bis)
 	return 0;
 }
 
-static int dc21x4x_send(struct eth_device* dev, volatile void *packet, int length)
+static int dc21x4x_send(struct eth_device *dev, void *packet, int length)
 {
 	int		status = -1;
 	int		i;
-- 
1.6.0.2

[U-Boot] [PATCH] drivers/net/dm9000x.c: Fix compile warning

[Joe Hershberger]

Fix this:
dm9000x.c: In function 'dm9000_initialize':
dm9000x.c:636:12: warning: assignment from incompatible pointer type

Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
Cc: Joe Hershberger <joe.hershberger@gmail.com>
---
 drivers/net/dm9000x.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/drivers/net/dm9000x.c b/drivers/net/dm9000x.c
index 0424110..f0c4499 100644
--- a/drivers/net/dm9000x.c
+++ b/drivers/net/dm9000x.c
@@ -406,8 +406,7 @@ static int dm9000_init(struct eth_device *dev, bd_t *bd)
   Hardware start transmission.
   Send a packet to media from the upper layer.
 */
-static int dm9000_send(struct eth_device *netdev, volatile void *packet,
-		     int length)
+static int dm9000_send(struct eth_device *netdev, void *packet, int length)
 {
 	int tmo;
 	struct board_info *db = &dm9000_info;
-- 
1.6.0.2

[U-Boot] [PATCH] drivers/net/dnet.c: Fix compile warning

[Joe Hershberger]

Fix this:
dnet.c: In function 'dnet_eth_initialize':
dnet.c:380:15: warning: assignment from incompatible pointer type

Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
Cc: Joe Hershberger <joe.hershberger@gmail.com>
---
 drivers/net/dnet.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/drivers/net/dnet.c b/drivers/net/dnet.c
index 15d0a6e..944a0c0 100644
--- a/drivers/net/dnet.c
+++ b/drivers/net/dnet.c
@@ -130,8 +130,7 @@ static u16 dnet_mdio_read(struct dnet_device *dnet, u8 reg)
 	return value;
 }
 
-static int dnet_send(struct eth_device *netdev, volatile void *packet,
-		     int length)
+static int dnet_send(struct eth_device *netdev, void *packet, int length)
 {
 	struct dnet_device *dnet = to_dnet(netdev);
 	int i, wrsz;
-- 
1.6.0.2

[U-Boot] [PATCH] drivers/net/eepro100.c: Fix compile warning

[Joe Hershberger]

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>
---
 drivers/net/eepro100.c |    7 +++----
 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.
 			 */
-- 
1.6.0.2

[U-Boot] [PATCH] drivers/net/enc28j60.c: Fix compile warning

[Joe Hershberger]

Fix this:
enc28j60.c: In function 'enc28j60_initialize':
enc28j60.c:967:12: warning: assignment from incompatible pointer type

Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
Cc: Joe Hershberger <joe.hershberger@gmail.com>
---
 drivers/net/enc28j60.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/net/enc28j60.c b/drivers/net/enc28j60.c
index e2011ae..c55667c 100644
--- a/drivers/net/enc28j60.c
+++ b/drivers/net/enc28j60.c
@@ -875,7 +875,7 @@ static int enc_recv(struct eth_device *dev)
  */
 static int enc_send(
 	struct eth_device *dev,
-	volatile void *packet,
+	void *packet,
 	int length)
 {
 	enc_dev_t *enc = dev->priv;
-- 
1.6.0.2

[U-Boot] [PATCH] drivers/net/fec_mxc.c: Fix compile warning

[Joe Hershberger]

Fix this:
fec_mxc.c: In function 'fec_probe':
fec_mxc.c:926:13: warning: assignment from incompatible pointer type

Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
Cc: Joe Hershberger <joe.hershberger@gmail.com>
---
 drivers/net/fec_mxc.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/net/fec_mxc.c b/drivers/net/fec_mxc.c
index 156fa8f..eee41d7 100644
--- a/drivers/net/fec_mxc.c
+++ b/drivers/net/fec_mxc.c
@@ -687,7 +687,7 @@ static void fec_halt(struct eth_device *dev)
  * @param[in] length Data count in bytes
  * @return 0 on success
  */
-static int fec_send(struct eth_device *dev, volatile void *packet, int length)
+static int fec_send(struct eth_device *dev, void *packet, int length)
 {
 	unsigned int status;
 	uint32_t size;
-- 
1.6.0.2

[U-Boot] [PATCH] drivers/net/ftmac100.c: Fix compile warning

[Joe Hershberger]

Fix this:
ftmac100.c: In function 'ftmac100_initialize':
ftmac100.c:266:12: warning: assignment from incompatible pointer type

Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
Cc: Joe Hershberger <joe.hershberger@gmail.com>
---
 drivers/net/ftmac100.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ftmac100.c b/drivers/net/ftmac100.c
index 94dc6d9..fdd3ec0 100644
--- a/drivers/net/ftmac100.c
+++ b/drivers/net/ftmac100.c
@@ -190,8 +190,7 @@ static int ftmac100_recv (struct eth_device *dev)
 /*
  * Send a data block via Ethernet
  */
-static int
-ftmac100_send (struct eth_device *dev, volatile void *packet, int length)
+static int ftmac100_send(struct eth_device *dev, void *packet, int length)
 {
 	struct ftmac100 *ftmac100 = (struct ftmac100 *)dev->iobase;
 	struct ftmac100_data *priv = dev->priv;
-- 
1.6.0.2

[U-Boot] [PATCH] drivers/net/ks8695eth.c: Fix compile warning

[Joe Hershberger]

Fix this:
ks8695eth.c: In function 'ks8695_eth_initialize':
ks8695eth.c:236:12: warning: assignment from incompatible pointer type

Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
Cc: Joe Hershberger <joe.hershberger@gmail.com>
---
 drivers/net/ks8695eth.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ks8695eth.c b/drivers/net/ks8695eth.c
index 8e988d1..b4904b6 100644
--- a/drivers/net/ks8695eth.c
+++ b/drivers/net/ks8695eth.c
@@ -190,8 +190,7 @@ static int ks8695_eth_recv(struct eth_device *dev)
 
 /****************************************************************************/
 
-static int ks8695_eth_send(struct eth_device *dev, volatile void *packet,
-	int len)
+static int ks8695_eth_send(struct eth_device *dev, void *packet, int len)
 {
 	volatile struct ks8695_txdesc *dp;
 	static int next = 0;
-- 
1.6.0.2

[U-Boot] [PATCH] drivers/net/lan91c96.c: Fix compile warning

[Joe Hershberger]

Fix this:
lan91c96.c: In function 'lan91c96_initialize':
lan91c96.c:811:12: warning: assignment from incompatible pointer type

Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
Cc: Joe Hershberger <joe.hershberger@gmail.com>
---
 drivers/net/lan91c96.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/lan91c96.c b/drivers/net/lan91c96.c
index 24b28da..11d350e 100644
--- a/drivers/net/lan91c96.c
+++ b/drivers/net/lan91c96.c
@@ -314,7 +314,7 @@ static void smc_shutdown(struct eth_device *dev)
  *	Enable the transmit interrupt, so I know if it failed
  *	Free the kernel data if I actually sent it.
  */
-static int smc_send_packet(struct eth_device *dev, volatile void *packet,
+static int smc_send_packet(struct eth_device *dev, void *packet,
 		int packet_length)
 {
 	byte packet_no;
@@ -700,7 +700,7 @@ static int lan91c96_recv(struct eth_device *dev)
 	return smc_rcv(dev);
 }
 
-static int lan91c96_send(struct eth_device *dev, volatile void *packet,
+static int lan91c96_send(struct eth_device *dev, void *packet,
 		int length)
 {
 	return smc_send_packet(dev, packet, length);
-- 
1.6.0.2

[U-Boot] [PATCH] drivers/net/macb.c: Fix compile warning

[Joe Hershberger]

Fix this:
macb.c: In function 'macb_eth_initialize':
macb.c:564:15: warning: assignment from incompatible pointer type

Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
Cc: Joe Hershberger <joe.hershberger@gmail.com>
---
 drivers/net/macb.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/drivers/net/macb.c b/drivers/net/macb.c
index c63eea9..4578467 100644
--- a/drivers/net/macb.c
+++ b/drivers/net/macb.c
@@ -197,8 +197,7 @@ int macb_miiphy_write(const char *devname, u8 phy_adr, u8 reg, u16 value)
 
 #if defined(CONFIG_CMD_NET)
 
-static int macb_send(struct eth_device *netdev, volatile void *packet,
-		     int length)
+static int macb_send(struct eth_device *netdev, void *packet, int length)
 {
 	struct macb_device *macb = to_macb(netdev);
 	unsigned long paddr, ctrl;
-- 
1.6.0.2

[U-Boot] [PATCH] drivers/net/smc91111.c: Fix compile warning

[Joe Hershberger]

Fix this:
smc91111.c: In function 'smc91111_initialize':
smc91111.c:1363:12: warning: assignment from incompatible pointer type

Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
Cc: Joe Hershberger <joe.hershberger@gmail.com>
---
 drivers/net/smc91111.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/drivers/net/smc91111.c b/drivers/net/smc91111.c
index 5cfef4d..6dc7ad5 100644
--- a/drivers/net/smc91111.c
+++ b/drivers/net/smc91111.c
@@ -426,8 +426,7 @@ static void smc_halt(struct eth_device *dev)
  .	Enable the transmit interrupt, so I know if it failed
  .	Free the kernel data if I actually sent it.
 */
-static int smc_send(struct eth_device *dev, volatile void *packet,
-	int packet_length)
+static int smc_send(struct eth_device *dev, void *packet, int packet_length)
 {
 	byte packet_no;
 	byte *buf;
-- 
1.6.0.2

[U-Boot] [PATCH] drivers/net/armada100_fec.c: Fix compile warning

[Prafulla Wadaskar]

> -----Original Message-----
> From: u-boot-bounces at lists.denx.de [mailto:u-boot-
> bounces at lists.denx.de] On Behalf Of Joe Hershberger
> Sent: 22 May 2012 06:15
> To: u-boot at lists.denx.de
> Cc: Joe Hershberger
> Subject: [U-Boot] [PATCH] drivers/net/armada100_fec.c: Fix compile
> warning
> 
> Fix this:
> armada100_fec.c: In function 'armada100_fec_register':
> armada100_fec.c:723:12: warning: assignment from incompatible pointer
> type
> 
> Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
> Cc: Joe Hershberger <joe.hershberger@gmail.com>
> ---
>  drivers/net/armada100_fec.c |    3 +--
>  1 files changed, 1 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/net/armada100_fec.c b/drivers/net/armada100_fec.c
> index 52be3a7..d318a36 100644
> --- a/drivers/net/armada100_fec.c
> +++ b/drivers/net/armada100_fec.c
> @@ -558,8 +558,7 @@ static void armdfec_halt(struct eth_device *dev)
>  	clrbits_le32(&regs->pconf, PCR_EN);
>  }
> 
> -static int armdfec_send(struct eth_device *dev, volatile void
> *dataptr,
> -		    int datasize)
> +static int armdfec_send(struct eth_device *dev, void *dataptr, int
> datasize)
>  {
>  	struct armdfec_device *darmdfec = to_darmdfec(dev);
>  	struct armdfec_reg *regs = darmdfec->regs;
> --

Acked-By: Prafulla Wadaskar <Prafulla@marvell.com>

Regards..
Prafulla . . .