diff options
| author | Wolfgang Denk <wd@denx.de> | 2012-05-20 21:14:54 +0000 |
|---|---|---|
| committer | Joe Hershberger <joe.hershberger@ni.com> | 2012-05-22 10:18:14 -0500 |
| commit | 1b10d0717a381ebf263e44488107dce40f75f4fb (patch) | |
| tree | d79926904ed46eb413e2eeddf43385d16ebaa2b3 /arch/powerpc/cpu/mpc8xx | |
| parent | e14826bc8d04235367e2e145b46a3d3f0bbeb86e (diff) | |
| download | olio-uboot-2014.01-1b10d0717a381ebf263e44488107dce40f75f4fb.tar.xz olio-uboot-2014.01-1b10d0717a381ebf263e44488107dce40f75f4fb.zip | |
MPC8xx: fix "Remove volatile from net API" aftermath
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>
Diffstat (limited to 'arch/powerpc/cpu/mpc8xx')
| -rw-r--r-- | arch/powerpc/cpu/mpc8xx/fec.c | 6 | ||||
| -rw-r--r-- | 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 f2a2c3a73..984539dbd 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 e376c64d5..2c93e24f3 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 |