aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2008-08-27 07:11:16 -0400
committerDavid S. Miller <davem@davemloft.net>2008-08-29 05:15:13 -0400
commit615deeb27b7c3f51b464b47e8b9a8e433ab2d0ca (patch)
treeef78356442a19abae279872aac2800cb45403301 /arch
parent454eeb2dd7bd0418451ea33a606d0fa50aa36718 (diff)
sparc: Kill sbus_ioremap() and sbus_iounmap().
No more users. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch')
-rw-r--r--arch/sparc/include/asm/io_32.h8
-rw-r--r--arch/sparc/include/asm/io_64.h13
-rw-r--r--arch/sparc/kernel/ioport.c16
-rw-r--r--arch/sparc/kernel/sparc_ksyms.c2
4 files changed, 0 insertions, 39 deletions
diff --git a/arch/sparc/include/asm/io_32.h b/arch/sparc/include/asm/io_32.h
index 3ab3164bd735..93fe21e02c86 100644
--- a/arch/sparc/include/asm/io_32.h
+++ b/arch/sparc/include/asm/io_32.h
@@ -293,14 +293,6 @@ extern void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long max);
293extern void pci_iounmap(struct pci_dev *dev, void __iomem *); 293extern void pci_iounmap(struct pci_dev *dev, void __iomem *);
294 294
295/* 295/*
296 * Bus number may be in res->flags... somewhere.
297 */
298extern void __iomem *sbus_ioremap(struct resource *res, unsigned long offset,
299 unsigned long size, char *name);
300extern void sbus_iounmap(volatile void __iomem *vaddr, unsigned long size);
301
302
303/*
304 * At the moment, we do not use CMOS_READ anywhere outside of rtc.c, 296 * At the moment, we do not use CMOS_READ anywhere outside of rtc.c,
305 * so rtc_port is static in it. This should not change unless a new 297 * so rtc_port is static in it. This should not change unless a new
306 * hardware pops up. 298 * hardware pops up.
diff --git a/arch/sparc/include/asm/io_64.h b/arch/sparc/include/asm/io_64.h
index 73a9c5d41954..4aee21dc9c6f 100644
--- a/arch/sparc/include/asm/io_64.h
+++ b/arch/sparc/include/asm/io_64.h
@@ -482,19 +482,6 @@ struct pci_dev;
482extern void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long max); 482extern void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long max);
483extern void pci_iounmap(struct pci_dev *dev, void __iomem *); 483extern void pci_iounmap(struct pci_dev *dev, void __iomem *);
484 484
485/* Similarly for SBUS. */
486#define sbus_ioremap(__res, __offset, __size, __name) \
487({ unsigned long __ret; \
488 __ret = (__res)->start + (((__res)->flags & 0x1ffUL) << 32UL); \
489 __ret += (unsigned long) (__offset); \
490 if (! request_region((__ret), (__size), (__name))) \
491 __ret = 0UL; \
492 (void __iomem *) __ret; \
493})
494
495#define sbus_iounmap(__addr, __size) \
496 release_region((unsigned long)(__addr), (__size))
497
498static inline int sbus_can_dma_64bit(void) 485static inline int sbus_can_dma_64bit(void)
499{ 486{
500 return 1; 487 return 1;
diff --git a/arch/sparc/kernel/ioport.c b/arch/sparc/kernel/ioport.c
index d82a810564ba..e6177dde103b 100644
--- a/arch/sparc/kernel/ioport.c
+++ b/arch/sparc/kernel/ioport.c
@@ -143,15 +143,6 @@ void iounmap(volatile void __iomem *virtual)
143 } 143 }
144} 144}
145 145
146/*
147 */
148void __iomem *sbus_ioremap(struct resource *phyres, unsigned long offset,
149 unsigned long size, char *name)
150{
151 return _sparc_alloc_io(phyres->flags & 0xF,
152 phyres->start + offset, size, name);
153}
154
155void __iomem *of_ioremap(struct resource *res, unsigned long offset, 146void __iomem *of_ioremap(struct resource *res, unsigned long offset,
156 unsigned long size, char *name) 147 unsigned long size, char *name)
157{ 148{
@@ -168,13 +159,6 @@ void of_iounmap(struct resource *res, void __iomem *base, unsigned long size)
168EXPORT_SYMBOL(of_iounmap); 159EXPORT_SYMBOL(of_iounmap);
169 160
170/* 161/*
171 */
172void sbus_iounmap(volatile void __iomem *addr, unsigned long size)
173{
174 iounmap(addr);
175}
176
177/*
178 * Meat of mapping 162 * Meat of mapping
179 */ 163 */
180static void __iomem *_sparc_alloc_io(unsigned int busno, unsigned long phys, 164static void __iomem *_sparc_alloc_io(unsigned int busno, unsigned long phys,
diff --git a/arch/sparc/kernel/sparc_ksyms.c b/arch/sparc/kernel/sparc_ksyms.c
index 84aaac435944..f2722ee3967d 100644
--- a/arch/sparc/kernel/sparc_ksyms.c
+++ b/arch/sparc/kernel/sparc_ksyms.c
@@ -154,8 +154,6 @@ EXPORT_SYMBOL(BTFIXUP_CALL(pgprot_noncached));
154 154
155#ifdef CONFIG_SBUS 155#ifdef CONFIG_SBUS
156EXPORT_SYMBOL(sbus_set_sbus64); 156EXPORT_SYMBOL(sbus_set_sbus64);
157EXPORT_SYMBOL(sbus_iounmap);
158EXPORT_SYMBOL(sbus_ioremap);
159#endif 157#endif
160#ifdef CONFIG_PCI 158#ifdef CONFIG_PCI
161EXPORT_SYMBOL(ebus_chain); 159EXPORT_SYMBOL(ebus_chain);