|
@@ -353,7 +353,7 @@ static inline unsigned int ioread8(const void __iomem *addr)
|
|
|
return (unsigned int)inb(port & PIO_MASK);
|
|
|
else
|
|
|
#ifndef CONFIG_IXP4XX_INDIRECT_PCI
|
|
|
- return (unsigned int)__raw_readb(port);
|
|
|
+ return (unsigned int)__raw_readb(addr);
|
|
|
#else
|
|
|
return (unsigned int)__indirect_readb(addr);
|
|
|
#endif
|
|
@@ -381,7 +381,7 @@ static inline unsigned int ioread16(const void __iomem *addr)
|
|
|
return (unsigned int)inw(port & PIO_MASK);
|
|
|
else
|
|
|
#ifndef CONFIG_IXP4XX_INDIRECT_PCI
|
|
|
- return le16_to_cpu(__raw_readw((u32)port));
|
|
|
+ return le16_to_cpu((__force __le16)__raw_readw(addr));
|
|
|
#else
|
|
|
return (unsigned int)__indirect_readw(addr);
|
|
|
#endif
|
|
@@ -440,7 +440,7 @@ static inline void iowrite8(u8 value, void __iomem *addr)
|
|
|
outb(value, port & PIO_MASK);
|
|
|
else
|
|
|
#ifndef CONFIG_IXP4XX_INDIRECT_PCI
|
|
|
- __raw_writeb(value, port);
|
|
|
+ __raw_writeb(value, addr);
|
|
|
#else
|
|
|
__indirect_writeb(value, addr);
|
|
|
#endif
|