SMC91111: Clean up SMC_inx macros on xsengine and xaeniax
PATCH 1/1 SMC91111: Clean up SMC_inx macros on xsengine and xaeniax
This patch fixes the following warnings:
Configuring for xaeniax board...smc91111_eeprom.c: In function 'print_macaddr':
smc91111_eeprom.c:278: warning: suggest parentheses around + or - in operand of & smc91111_eeprom.c:281: warning: suggest parentheses around + or - in operand of &
...
Configuring for xsengine board...smc91111_eeprom.c: In function 'print_macaddr':
smc91111_eeprom.c:278: warning: suggest parentheses around + or - inside shift smc91111_eeprom.c:281: warning: suggest parentheses around + or - inside shift
Signed-off-by Ben Warren <[email protected]>
---
This replaces the previous 'bad' patch named
'smc91111_eeprom: fix compile warning
drivers/net/smc91111.h | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-)
drivers/net/smc91111.h +4 -4
@@ -81,10 +81,10 @@ struct smc91111_priv{#ifdef CONFIG_PXA250 #ifdef CONFIG_XSENGINE -#define SMC_inl (a,r) (*((volatile dword *)((a)->iobase+(r<<1)))) -#define SMC_inw (a,r) (*((volatile word *)((a)->iobase+(r<<1)))) +#define SMC_inl (a,r) (*((volatile dword *)((a)->iobase+((r)<<1)))) +#define SMC_inw (a,r) (*((volatile word *)((a)->iobase+((r)<<1))))#define SMC_inb (a,p) ({ \ - unsigned int __p = (unsigned int)((a)->iobase + (p<<1)); \ + unsigned int __p = (unsigned int)((a)->iobase + ((p)<<1)); \ unsigned int __v = *(volatile unsigned short *)((__p) & ~2); \ if (__p & 2) __v >>= 8; \ else __v &= 0xff; \
@@ -99,7 +99,7 @@ struct smc91111_priv{ __v; })#define SMC_inb (a,p) ({ \ unsigned int ___v = SMC_inw((a),(p) & ~1); \ - if (p & 1) ___v >>= 8; \ + if ((p) & 1) ___v >>= 8; \ else ___v &= 0xff; \ ___v; })#else
Signature · 1 line
1.6.0.4