diff options
| -rw-r--r-- | arch/arm/mach-ixp4xx/include/mach/io.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-ixp4xx/include/mach/io.h b/arch/arm/mach-ixp4xx/include/mach/io.h index 6ea7e2fb2701..de274a1f19d7 100644 --- a/arch/arm/mach-ixp4xx/include/mach/io.h +++ b/arch/arm/mach-ixp4xx/include/mach/io.h | |||
| @@ -353,7 +353,7 @@ static inline unsigned int ioread8(const void __iomem *addr) | |||
| 353 | return (unsigned int)inb(port & PIO_MASK); | 353 | return (unsigned int)inb(port & PIO_MASK); |
| 354 | else | 354 | else |
| 355 | #ifndef CONFIG_IXP4XX_INDIRECT_PCI | 355 | #ifndef CONFIG_IXP4XX_INDIRECT_PCI |
| 356 | return (unsigned int)__raw_readb(port); | 356 | return (unsigned int)__raw_readb(addr); |
| 357 | #else | 357 | #else |
| 358 | return (unsigned int)__indirect_readb(addr); | 358 | return (unsigned int)__indirect_readb(addr); |
| 359 | #endif | 359 | #endif |
| @@ -381,7 +381,7 @@ static inline unsigned int ioread16(const void __iomem *addr) | |||
| 381 | return (unsigned int)inw(port & PIO_MASK); | 381 | return (unsigned int)inw(port & PIO_MASK); |
| 382 | else | 382 | else |
| 383 | #ifndef CONFIG_IXP4XX_INDIRECT_PCI | 383 | #ifndef CONFIG_IXP4XX_INDIRECT_PCI |
| 384 | return le16_to_cpu(__raw_readw((u32)port)); | 384 | return le16_to_cpu((__force __le16)__raw_readw(addr)); |
| 385 | #else | 385 | #else |
| 386 | return (unsigned int)__indirect_readw(addr); | 386 | return (unsigned int)__indirect_readw(addr); |
| 387 | #endif | 387 | #endif |
| @@ -440,7 +440,7 @@ static inline void iowrite8(u8 value, void __iomem *addr) | |||
| 440 | outb(value, port & PIO_MASK); | 440 | outb(value, port & PIO_MASK); |
| 441 | else | 441 | else |
| 442 | #ifndef CONFIG_IXP4XX_INDIRECT_PCI | 442 | #ifndef CONFIG_IXP4XX_INDIRECT_PCI |
| 443 | __raw_writeb(value, port); | 443 | __raw_writeb(value, addr); |
| 444 | #else | 444 | #else |
| 445 | __indirect_writeb(value, addr); | 445 | __indirect_writeb(value, addr); |
| 446 | #endif | 446 | #endif |
