diff options
| author | Will Deacon <will.deacon@arm.com> | 2013-09-04 06:37:53 -0400 |
|---|---|---|
| committer | Will Deacon <will.deacon@arm.com> | 2014-10-20 13:49:17 -0400 |
| commit | 916136b374566181386bb79ed638de8a8d8b426e (patch) | |
| tree | b3c72c137d2e92a596b37e1a37ab4303291a981b | |
| parent | e3bc1e2421a14dcc273bf945343a6c948e839c8c (diff) | |
s390: io: remove dummy relaxed accessor macros for reads
These are now defined by asm-generic/io.h, so we don't need the private
definitions anymore.
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
| -rw-r--r-- | arch/s390/include/asm/io.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/s390/include/asm/io.h b/arch/s390/include/asm/io.h index cd6b9ee7b69c..722befdf8332 100644 --- a/arch/s390/include/asm/io.h +++ b/arch/s390/include/asm/io.h | |||
| @@ -60,11 +60,6 @@ static inline void iounmap(volatile void __iomem *addr) | |||
| 60 | #define __raw_writel zpci_write_u32 | 60 | #define __raw_writel zpci_write_u32 |
| 61 | #define __raw_writeq zpci_write_u64 | 61 | #define __raw_writeq zpci_write_u64 |
| 62 | 62 | ||
| 63 | #define readb_relaxed readb | ||
| 64 | #define readw_relaxed readw | ||
| 65 | #define readl_relaxed readl | ||
| 66 | #define readq_relaxed readq | ||
| 67 | |||
| 68 | #endif /* CONFIG_PCI */ | 63 | #endif /* CONFIG_PCI */ |
| 69 | 64 | ||
| 70 | #include <asm-generic/io.h> | 65 | #include <asm-generic/io.h> |