Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-10 22:21:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

sh: Kill off deprecated fixed PCI memory window accessors.

Browse Source 
This kills off the deprected fixed memory range accessors for
the cases of non-translatable ioremapping.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>
This commit is contained in:
Paul Mundt 2010-01-29 16:14:29 +09:00
parent abec86a802
commit 9762528f37
2 changed files with 0 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
arch/sh/include/asm/pci.h
View File

@ -99,20 +99,6 @@ static inline void pci_dma_burst_advice(struct pci_dev *pdev,
}
#endif
#ifdef CONFIG_SUPERH32
/*
* If we're on an SH7751 or SH7780 PCI controller, PCI memory is mapped
* at the end of the address space in a special non-translatable area.
*/
#define PCI_MEM_FIXED_START 0xfd000000
#define PCI_MEM_FIXED_END (PCI_MEM_FIXED_START + 0x01000000)
#define is_pci_memory_fixed_range(s, e) \
((s) >= PCI_MEM_FIXED_START && (e) < PCI_MEM_FIXED_END)
#else
#define is_pci_memory_fixed_range(s, e) (0)
#endif
/* Board-specific fixup routines. */
int pcibios_map_platform_irq(struct pci_dev *dev, u8 slot, u8 pin);

15
arch/sh/mm/ioremap.c
View File

@ -45,18 +45,6 @@ __ioremap_caller(unsigned long phys_addr, unsigned long size,
if (!size || last_addr < phys_addr)
return NULL;
/*
* If we're in the fixed PCI memory range, mapping through page
* tables is not only pointless, but also fundamentally broken.
* Just return the physical address instead.
*
* For boards that map a small PCI memory aperture somewhere in
* P1/P2 space, ioremap() will already do the right thing,
* and we'll never get this far.
*/
if (is_pci_memory_fixed_range(phys_addr, size))
return (void __iomem *)phys_addr;
/*
* Mappings have to be page-aligned
*/
@ -125,9 +113,6 @@ static inline int iomapping_nontranslatable(unsigned long offset)
return 1;
#endif
if (is_pci_memory_fixed_range(offset, 0))
return 1;
return 0;
}