Merge branch 'for-2.6.37/core' of git://git.kernel.dk/linux-2.6-block

[mv-sheeva.git] / sound / pci / asihpi / hpios.c

diff --git a/sound/pci/asihpi/hpios.c b/sound/pci/asihpi/hpios.c
index de615cfdb9502d627656b0723e248e1d9976ed73..742ee12a9e17749371b9d87540094638666666a8 100644 (file)
--- a/sound/pci/asihpi/hpios.c
+++ b/sound/pci/asihpi/hpios.c
@@ -89,26 +89,3 @@ u16 hpios_locked_mem_free(struct consistent_dma_area *p_mem_area)
 void hpios_locked_mem_free_all(void)
 {
 }
-
-void __iomem *hpios_map_io(struct pci_dev *pci_dev, int idx,
-       unsigned int length)
-{
-       HPI_DEBUG_LOG(DEBUG, "mapping %d %s %08llx-%08llx %04llx len 0x%x\n",
-               idx, pci_dev->resource[idx].name,
-               (unsigned long long)pci_resource_start(pci_dev, idx),
-               (unsigned long long)pci_resource_end(pci_dev, idx),
-               (unsigned long long)pci_resource_flags(pci_dev, idx), length);
-
-       if (!(pci_resource_flags(pci_dev, idx) & IORESOURCE_MEM)) {
-               HPI_DEBUG_LOG(ERROR, "not an io memory resource\n");
-               return NULL;
-       }
-
-       if (length > pci_resource_len(pci_dev, idx)) {
-               HPI_DEBUG_LOG(ERROR, "resource too small for requested %d \n",
-                       length);
-               return NULL;
-       }
-
-       return ioremap(pci_resource_start(pci_dev, idx), length);
-}