Commit db288a9 "net: Remove volatile from net API" caused a number of build warnings: fec.c: In function 'fec_initialize': fec.c:183:13: warning: assignment from incompatible pointer type [enabled by default] fec.c: In function 'fec_recv': fec.c:284:5: warning: passing argument 1 of 'NetReceive' discards 'volatile' qualifier from pointer target type [enabled by default] /home/wd/git/u-boot/work/include/net.h:433:13: note: expected 'uchar *' but argument is of type 'volatile uchar *' scc.c: In function 'scc_initialize': scc.c:85:14: warning: assignment from incompatible pointer type [enabled by default]
Fix these.
Signed-off-by: Wolfgang Denk wd@denx.de Cc: Joe Hershberger joe.hershberger@ni.com ---
Joe, I started fixing these issues when I realized that this is not just a few files, but actually _ALL_ network drivers that you forgot to adapt. I wonder how much testing was done before you decided to pull this into mainline? It appears not much compile testing... what about run-time testing?
Sorry, but I don't have time to clean up all of this. Are you going to do that?
-wd
arch/powerpc/cpu/mpc8xx/fec.c | 6 +++--- arch/powerpc/cpu/mpc8xx/scc.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/arch/powerpc/cpu/mpc8xx/fec.c b/arch/powerpc/cpu/mpc8xx/fec.c index f2a2c3a..64e2ef7 100644 --- a/arch/powerpc/cpu/mpc8xx/fec.c +++ b/arch/powerpc/cpu/mpc8xx/fec.c @@ -139,7 +139,7 @@ typedef volatile struct CommonBufferDescriptor {
static RTXBD *rtx = NULL;
-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); static int fec_recv(struct eth_device* dev); static int fec_init(struct eth_device* dev, bd_t * bd); static void fec_halt(struct eth_device* dev); @@ -193,7 +193,7 @@ int fec_initialize(bd_t *bis) return 1; }
-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) { int j, rc; struct ether_fcc_info_s *efis = dev->priv; @@ -267,7 +267,7 @@ static int fec_recv (struct eth_device *dev) rtx->rxbd[rxIdx].cbd_sc); #endif } else { - volatile uchar *rx = NetRxPackets[rxIdx]; + uchar *rx = NetRxPackets[rxIdx];
length -= 4;
diff --git a/arch/powerpc/cpu/mpc8xx/scc.c b/arch/powerpc/cpu/mpc8xx/scc.c index e376c64..b172121 100644 --- a/arch/powerpc/cpu/mpc8xx/scc.c +++ b/arch/powerpc/cpu/mpc8xx/scc.c @@ -65,7 +65,7 @@ typedef volatile struct CommonBufferDescriptor {
static RTXBD *rtx;
-static int scc_send(struct eth_device* dev, volatile void *packet, int length); +static int scc_send(struct eth_device* dev, void *packet, int length); static int scc_recv(struct eth_device* dev); static int scc_init (struct eth_device* dev, bd_t * bd); static void scc_halt(struct eth_device* dev); @@ -90,7 +90,7 @@ int scc_initialize(bd_t *bis) return 1; }
-static int scc_send(struct eth_device* dev, volatile void *packet, int length) +static int scc_send(struct eth_device* dev, void *packet, int length) { int i, j=0; #if 0