Commit 9762528f authored by Paul Mundt's avatar Paul Mundt
Browse files

sh: Kill off deprecated fixed PCI memory window accessors. 



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

Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent abec86a8

arch/sh/include/asm/pci.h

+0 −14
Original line number Diff line number Diff line
@@ -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);

arch/sh/mm/ioremap.c

+0 −15
Original line number Diff line number Diff line
@@ -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;

}