Skip to content

Commit 478e170

Browse files
mpemaddy-kerneldev
authored andcommitted
powerpc/io: Remove PPC_IO_WORKAROUNDS
The Cell blade support was the last user of PPC_IO_WORKAROUNDS, so they can now be removed. Signed-off-by: Michael Ellerman <[email protected]> Signed-off-by: Madhavan Srinivasan <[email protected]> Link: https://patch.msgid.link/[email protected]
1 parent f026dff commit 478e170

File tree

5 files changed

+0
-266
lines changed

5 files changed

+0
-266
lines changed

arch/powerpc/include/asm/io-workarounds.h

Lines changed: 0 additions & 55 deletions
This file was deleted.

arch/powerpc/kernel/Makefile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -152,8 +152,6 @@ obj-$(CONFIG_PCI_MSI) += msi.o
152152
obj-$(CONFIG_AUDIT) += audit.o
153153
obj64-$(CONFIG_AUDIT) += compat_audit.o
154154

155-
obj-$(CONFIG_PPC_IO_WORKAROUNDS) += io-workarounds.o
156-
157155
obj-y += trace/
158156

159157
ifneq ($(CONFIG_PPC_INDIRECT_PIO),y)

arch/powerpc/kernel/io-workarounds.c

Lines changed: 0 additions & 197 deletions
This file was deleted.

arch/powerpc/mm/ioremap.c

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
#include <linux/slab.h>
55
#include <linux/mmzone.h>
66
#include <linux/vmalloc.h>
7-
#include <asm/io-workarounds.h>
87

98
unsigned long ioremap_bot;
109
EXPORT_SYMBOL(ioremap_bot);
@@ -14,8 +13,6 @@ void __iomem *ioremap(phys_addr_t addr, unsigned long size)
1413
pgprot_t prot = pgprot_noncached(PAGE_KERNEL);
1514
void *caller = __builtin_return_address(0);
1615

17-
if (iowa_is_active())
18-
return iowa_ioremap(addr, size, prot, caller);
1916
return __ioremap_caller(addr, size, prot, caller);
2017
}
2118
EXPORT_SYMBOL(ioremap);
@@ -25,8 +22,6 @@ void __iomem *ioremap_wc(phys_addr_t addr, unsigned long size)
2522
pgprot_t prot = pgprot_noncached_wc(PAGE_KERNEL);
2623
void *caller = __builtin_return_address(0);
2724

28-
if (iowa_is_active())
29-
return iowa_ioremap(addr, size, prot, caller);
3025
return __ioremap_caller(addr, size, prot, caller);
3126
}
3227
EXPORT_SYMBOL(ioremap_wc);
@@ -36,8 +31,6 @@ void __iomem *ioremap_coherent(phys_addr_t addr, unsigned long size)
3631
pgprot_t prot = pgprot_cached(PAGE_KERNEL);
3732
void *caller = __builtin_return_address(0);
3833

39-
if (iowa_is_active())
40-
return iowa_ioremap(addr, size, prot, caller);
4134
return __ioremap_caller(addr, size, prot, caller);
4235
}
4336

@@ -50,8 +43,6 @@ void __iomem *ioremap_prot(phys_addr_t addr, size_t size, unsigned long flags)
5043
if (pte_write(pte))
5144
pte = pte_mkdirty(pte);
5245

53-
if (iowa_is_active())
54-
return iowa_ioremap(addr, size, pte_pgprot(pte), caller);
5546
return __ioremap_caller(addr, size, pte_pgprot(pte), caller);
5647
}
5748
EXPORT_SYMBOL(ioremap_prot);

arch/powerpc/platforms/Kconfig

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -189,9 +189,6 @@ config PPC_INDIRECT_PIO
189189
config PPC_INDIRECT_MMIO
190190
bool
191191

192-
config PPC_IO_WORKAROUNDS
193-
bool
194-
195192
source "drivers/cpufreq/Kconfig"
196193

197194
menu "CPUIdle driver"

0 commit comments

Comments
 (0)