diff options
author | Takashi Iwai <tiwai@suse.de> | 2010-05-29 23:50:33 +0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2010-05-29 23:50:33 +0400 |
commit | a98d3984c85222aa9efc63c4f9dd3d805ce469f2 (patch) | |
tree | aeb9ebdcc06ca92b8114f30cedf16b8f3780b3f2 /sound/pci/asihpi/hpios.c | |
parent | 52593de4c11fb24c83d8036ba34706881aab5e3d (diff) | |
parent | 55567ab70bd8551c73253e44ea5244db41eac81b (diff) | |
download | linux-a98d3984c85222aa9efc63c4f9dd3d805ce469f2.tar.xz |
Merge branch 'fix/misc' into for-linus
Diffstat (limited to 'sound/pci/asihpi/hpios.c')
-rw-r--r-- | sound/pci/asihpi/hpios.c | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/sound/pci/asihpi/hpios.c b/sound/pci/asihpi/hpios.c index de615cfdb950..742ee12a9e17 100644 --- 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); -} |