diff options
| author | Wolfgang Denk <wd@denx.de> | 2009-11-11 23:10:34 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2009-11-11 23:10:34 +0100 |
| commit | 4f127980e0d4ba179b4628ebf8e8642210731055 (patch) | |
| tree | 5748931e40e1f7ed26817f26326e5f8c386d9a4f /drivers/net/smc91111.h | |
| parent | a9e9d69dd8849aa230fab88a7f3f4435713763af (diff) | |
| parent | 651ef90fa6ca824c8e581aeef9e04bbbe7f7e9ce (diff) | |
| download | u-boot-imx-4f127980e0d4ba179b4628ebf8e8642210731055.zip u-boot-imx-4f127980e0d4ba179b4628ebf8e8642210731055.tar.gz u-boot-imx-4f127980e0d4ba179b4628ebf8e8642210731055.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-net
Diffstat (limited to 'drivers/net/smc91111.h')
| -rw-r--r-- | drivers/net/smc91111.h | 8 |
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 |