summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Kitt <steve@sk2.org>2019-07-16 19:27:04 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2019-07-16 22:23:22 -0400
commit3a7f0adfe7c27cdaf6dc3456226a430398732e2c (patch)
tree37943ef3fdbff759a7e8f77e79f9f58662487dbf
parentfe6ba88b251aa76a94be2cb441d2e6b7c623b989 (diff)
arch/*: remove unused isa_page_to_bus()
isa_page_to_bus() is deprecated and is no longer used anywhere. Remove it entirely. Link: http://lkml.kernel.org/r/20190613161155.16946-1-steve@sk2.org Signed-off-by: Stephen Kitt <steve@sk2.org> Acked-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--arch/alpha/include/asm/io.h5
-rw-r--r--arch/arm/include/asm/io.h1
-rw-r--r--arch/mips/include/asm/io.h2
-rw-r--r--arch/x86/include/asm/io.h1
4 files changed, 0 insertions, 9 deletions
diff --git a/arch/alpha/include/asm/io.h b/arch/alpha/include/asm/io.h
index ccf9d65166bb..af2c0063dc75 100644
--- a/arch/alpha/include/asm/io.h
+++ b/arch/alpha/include/asm/io.h
@@ -93,11 +93,6 @@ static inline void * phys_to_virt(unsigned long address)
93 93
94#define page_to_phys(page) page_to_pa(page) 94#define page_to_phys(page) page_to_pa(page)
95 95
96static inline dma_addr_t __deprecated isa_page_to_bus(struct page *page)
97{
98 return page_to_phys(page);
99}
100
101/* Maximum PIO space address supported? */ 96/* Maximum PIO space address supported? */
102#define IO_SPACE_LIMIT 0xffff 97#define IO_SPACE_LIMIT 0xffff
103 98
diff --git a/arch/arm/include/asm/io.h b/arch/arm/include/asm/io.h
index f11c35cf0b74..7a0596fcb2e7 100644
--- a/arch/arm/include/asm/io.h
+++ b/arch/arm/include/asm/io.h
@@ -30,7 +30,6 @@
30 * ISA I/O bus memory addresses are 1:1 with the physical address. 30 * ISA I/O bus memory addresses are 1:1 with the physical address.
31 */ 31 */
32#define isa_virt_to_bus virt_to_phys 32#define isa_virt_to_bus virt_to_phys
33#define isa_page_to_bus page_to_phys
34#define isa_bus_to_virt phys_to_virt 33#define isa_bus_to_virt phys_to_virt
35 34
36/* 35/*
diff --git a/arch/mips/include/asm/io.h b/arch/mips/include/asm/io.h
index 29997e42480e..1790274c27eb 100644
--- a/arch/mips/include/asm/io.h
+++ b/arch/mips/include/asm/io.h
@@ -149,8 +149,6 @@ static inline void *isa_bus_to_virt(unsigned long address)
149 return phys_to_virt(address); 149 return phys_to_virt(address);
150} 150}
151 151
152#define isa_page_to_bus page_to_phys
153
154/* 152/*
155 * However PCI ones are not necessarily 1:1 and therefore these interfaces 153 * However PCI ones are not necessarily 1:1 and therefore these interfaces
156 * are forbidden in portable PCI drivers. 154 * are forbidden in portable PCI drivers.
diff --git a/arch/x86/include/asm/io.h b/arch/x86/include/asm/io.h
index a06a9f8294ea..6bed97ff6db2 100644
--- a/arch/x86/include/asm/io.h
+++ b/arch/x86/include/asm/io.h
@@ -165,7 +165,6 @@ static inline unsigned int isa_virt_to_bus(volatile void *address)
165{ 165{
166 return (unsigned int)virt_to_phys(address); 166 return (unsigned int)virt_to_phys(address);
167} 167}
168#define isa_page_to_bus(page) ((unsigned int)page_to_phys(page))
169#define isa_bus_to_virt phys_to_virt 168#define isa_bus_to_virt phys_to_virt
170 169
171/* 170/*