diff options
| author | David S. Miller <davem@davemloft.net> | 2008-08-27 07:11:16 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-08-29 05:15:13 -0400 |
| commit | 615deeb27b7c3f51b464b47e8b9a8e433ab2d0ca (patch) | |
| tree | ef78356442a19abae279872aac2800cb45403301 /arch/sparc/include | |
| parent | 454eeb2dd7bd0418451ea33a606d0fa50aa36718 (diff) | |
sparc: Kill sbus_ioremap() and sbus_iounmap().
No more users.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc/include')
| -rw-r--r-- | arch/sparc/include/asm/io_32.h | 8 | ||||
| -rw-r--r-- | arch/sparc/include/asm/io_64.h | 13 |
2 files changed, 0 insertions, 21 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); | |||
| 293 | extern void pci_iounmap(struct pci_dev *dev, void __iomem *); | 293 | extern void pci_iounmap(struct pci_dev *dev, void __iomem *); |
| 294 | 294 | ||
| 295 | /* | 295 | /* |
| 296 | * Bus number may be in res->flags... somewhere. | ||
| 297 | */ | ||
| 298 | extern void __iomem *sbus_ioremap(struct resource *res, unsigned long offset, | ||
| 299 | unsigned long size, char *name); | ||
| 300 | extern 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; | |||
| 482 | extern void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long max); | 482 | extern void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long max); |
| 483 | extern void pci_iounmap(struct pci_dev *dev, void __iomem *); | 483 | extern 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 | |||
| 498 | static inline int sbus_can_dma_64bit(void) | 485 | static inline int sbus_can_dma_64bit(void) |
| 499 | { | 486 | { |
| 500 | return 1; | 487 | return 1; |