SMC91111: Fix compilation warnings
PATCH 1/1 SMC91111: Fix compilation warnings
This patch fixes the following warning messages coming out of 'drivers/net/smc91111.h' when compiled for 'vexpress_aemv8a':
warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]
Currently this issue seems to surface when SMSC is compiled for 64-bit ARMv8 platforms, so the change is protected under CONFIG_ARM64, so that it doesn't break other existing platforms.
In addition this patch tries to fix some checkpatch errors and warnings (others related to camel-casing and volatile usage will be addressed by a later patch).
This fix has been tested on both ARMv8 foundation model v1 and v2.
--- drivers/net/smc91111.h | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-)
drivers/net/smc91111.h +12 -3
@@ -248,17 +248,26 @@ struct smc91111_priv{#define SMC_inw (a,r) (*((volatile word *)((a)->iobase+((r)<<1))))#elif CONFIG_BLACKFIN #define SMC_inw (a,r) ({ word __v = (*((volatile word *)((a)->iobase+(r)))); SSYNC(); __v;}) +#elif CONFIG_ARM64 +#define SMC_inw (a, r) (*((volatile word*)((a)->iobase+((dword)(r)))))#else -#define SMC_inw (a,r) (*((volatile word *)((a)->iobase+(r)))) +#define SMC_inw (a, r) (*((volatile word*)((a)->iobase+(r))))#endif #define SMC_inb (a,r) (((r)&1) ? SMC_inw((a),(r)&~1)>>8 : SMC_inw((a),(r)&0xFF))#ifdef CONFIG_ADNPESC1 #define SMC_outw (a,d,r) (*((volatile word *)((a)->iobase+((r)<<1))) = d)#elif CONFIG_BLACKFIN -#define SMC_outw (a,d,r) {(*((volatile word *)((a)->iobase+(r))) = d); SSYNC();} +#define SMC_outw (a, d, r) \ + ({ (*((volatile word*)((a)->iobase+((r)))) = d); \ + SSYNC(); \ + }) +#elif CONFIG_ARM64 +#define SMC_outw (a, d, r) \ + (*((volatile word*)((a)->iobase+((dword)(r)))) = d)#else -#define SMC_outw (a,d,r) (*((volatile word *)((a)->iobase+(r))) = d) +#define SMC_outw (a, d, r) \ + (*((volatile word*)((a)->iobase+(r))) = d)#endif #define SMC_outb (a,d,r) ({ word __d = (byte)(d); \ word __w = SMC_inw((a),(r)&~1); \
Signature · 1 line
1.7.9.5
PATCH 1/1 SMC91111: Fix compilation warnings
Quoted 9 lines · Bhupesh Sharma
This patch fixes the following warning messages coming out of '
drivers/net/smc91111.h' when compiled for 'vexpress_aemv8a':warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]
Currently this issue seems to surface when SMSC is compiled for 64-bit ARMv8 platforms, so the change is protected under
CONFIG_ARM64, so that it doesn't break other existing platforms.
Quoted 7 lines
In addition this patch tries to fix some checkpatch errors and warnings (others related to camel-casing and volatile usage will be addressed by a later patch).
This fix has been tested on both ARMv8 foundation model v1 and v2.
Signed-off-by Bhupesh Sharma <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20140221/bd3c11fc/attachment.pgp>