From e32acaf601445ddc4baa52a1e4df638543455029 Mon Sep 17 00:00:00 2001 From: Paul Mundt Date: Sun, 11 Nov 2007 17:37:21 +0900 Subject: sh: Kill off lib64 version of iomap wrappers. Signed-off-by: Paul Mundt --- arch/sh/lib64/Makefile | 2 +- arch/sh/lib64/iomap.c | 54 -------------------------------------------------- 2 files changed, 1 insertion(+), 55 deletions(-) delete mode 100644 arch/sh/lib64/iomap.c (limited to 'arch') diff --git a/arch/sh/lib64/Makefile b/arch/sh/lib64/Makefile index c8c7cf4e8b4..2f4086ac6f9 100644 --- a/arch/sh/lib64/Makefile +++ b/arch/sh/lib64/Makefile @@ -11,5 +11,5 @@ # Panic should really be compiled as PIC lib-y := udelay.o c-checksum.o dbg.o panic.o memcpy.o copy_user_memcpy.o \ - page_copy.o page_clear.o iomap.o + page_copy.o page_clear.o diff --git a/arch/sh/lib64/iomap.c b/arch/sh/lib64/iomap.c deleted file mode 100644 index 253d1e351d4..00000000000 --- a/arch/sh/lib64/iomap.c +++ /dev/null @@ -1,54 +0,0 @@ -/* - * arch/sh64/lib/iomap.c - * - * Generic sh64 iomap interface - * - * Copyright (C) 2004 Paul Mundt - * - * This file is subject to the terms and conditions of the GNU General Public - * License. See the file "COPYING" in the main directory of this archive - * for more details. - */ -#include -#include - -void __iomem *__attribute__ ((weak)) -ioport_map(unsigned long port, unsigned int len) -{ - return (void __iomem *)port; -} -EXPORT_SYMBOL(ioport_map); - -void ioport_unmap(void __iomem *addr) -{ - /* Nothing .. */ -} -EXPORT_SYMBOL(ioport_unmap); - -#ifdef CONFIG_PCI -void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long max) -{ - unsigned long start = pci_resource_start(dev, bar); - unsigned long len = pci_resource_len(dev, bar); - unsigned long flags = pci_resource_flags(dev, bar); - - if (!len) - return NULL; - if (max && len > max) - len = max; - if (flags & IORESOURCE_IO) - return ioport_map(start + pciio_virt, len); - if (flags & IORESOURCE_MEM) - return (void __iomem *)start; - - /* What? */ - return NULL; -} -EXPORT_SYMBOL(pci_iomap); - -void pci_iounmap(struct pci_dev *dev, void __iomem *addr) -{ - /* Nothing .. */ -} -EXPORT_SYMBOL(pci_iounmap); -#endif -- cgit v1.2.3