From 7315dffb9d2214eb3f08f5ebc36d812d4942fc0f Mon Sep 17 00:00:00 2001
From: Eliot Blennerhassett <eblennerhassett@audioscience.com>
Date: Thu, 27 May 2010 17:53:51 +1200
Subject: [PATCH] --- yaml --- r: 199293 b: refs/heads/master c:
 f038e27c9e9adc166b6004e3a09cc57d61fdbd7b h: refs/heads/master i:   199291:
 5c4a144803992fca2065696dff56390b7d4e6f82 v: v3

---
 [refs]                         |  2 +-
 trunk/sound/pci/asihpi/hpios.c | 23 -----------------------
 trunk/sound/pci/asihpi/hpios.h |  9 ---------
 3 files changed, 1 insertion(+), 33 deletions(-)

diff --git a/[refs] b/[refs]
index 9dd619e0f0f2..49aab23695a2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 92c256110fa9566de639ef8948b4fb430aa495b3
+refs/heads/master: f038e27c9e9adc166b6004e3a09cc57d61fdbd7b
diff --git a/trunk/sound/pci/asihpi/hpios.c b/trunk/sound/pci/asihpi/hpios.c
index de615cfdb950..742ee12a9e17 100644
--- a/trunk/sound/pci/asihpi/hpios.c
+++ b/trunk/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);
-}
diff --git a/trunk/sound/pci/asihpi/hpios.h b/trunk/sound/pci/asihpi/hpios.h
index a62c3f1e5f09..370f39b43f85 100644
--- a/trunk/sound/pci/asihpi/hpios.h
+++ b/trunk/sound/pci/asihpi/hpios.h
@@ -166,13 +166,4 @@ struct hpi_adapter {
 	void __iomem *ap_remapped_mem_base[HPI_MAX_ADAPTER_MEM_SPACES];
 };
 
-static inline void hpios_unmap_io(void __iomem *addr,
-	unsigned long size)
-{
-	iounmap(addr);
-}
-
-void __iomem *hpios_map_io(struct pci_dev *pci_dev, int idx,
-	unsigned int length);
-
 #endif