summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorBen Warren <biggerbadderben@gmail.com>2009-11-09 14:01:08 -0800
committerBen Warren <biggerbadderben@gmail.com>2009-11-09 21:55:09 -0800
commit1031ae960ce6ce8332190278a06e2d72c2b2793e (patch)
treea08ed96be5f9d2e4a7f907dd4cf0581a08976d06 /drivers
parent830c7b6722c6a9762411bf52a7bf2fae4dc71dab (diff)
downloadu-boot-imx-1031ae960ce6ce8332190278a06e2d72c2b2793e.zip
u-boot-imx-1031ae960ce6ce8332190278a06e2d72c2b2793e.tar.gz
u-boot-imx-1031ae960ce6ce8332190278a06e2d72c2b2793e.tar.bz2
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 <biggerbadderben@gmail.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/smc91111.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/smc91111.h b/drivers/net/smc91111.h
index bb45241..895c749 100644
--- a/drivers/net/smc91111.h
+++ b/drivers/net/smc91111.h
@@ -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