Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 199293
b: refs/heads/master
c: f038e27
h: refs/heads/master
i:
  199291: 5c4a144
v: v3
  • Loading branch information
Eliot Blennerhassett authored and Takashi Iwai committed May 27, 2010
1 parent 87d6cab commit 7315dff
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 33 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 92c256110fa9566de639ef8948b4fb430aa495b3
refs/heads/master: f038e27c9e9adc166b6004e3a09cc57d61fdbd7b
23 changes: 0 additions & 23 deletions trunk/sound/pci/asihpi/hpios.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
9 changes: 0 additions & 9 deletions trunk/sound/pci/asihpi/hpios.h
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 7315dff

Please sign in to comment.