diff options
author | David Woodhouse <David.Woodhouse@intel.com> | 2009-07-29 03:39:26 -0400 |
---|---|---|
committer | David Woodhouse <David.Woodhouse@intel.com> | 2009-08-03 04:04:54 -0400 |
commit | c2980d8c2961113f24863f70d8ad016f55224c81 (patch) | |
tree | 642962c363fe11d2ead4caffeaaf712629259dfa /drivers/char/agp/intel-agp.c | |
parent | 56ec4c1e72865c6d99f643b6574e6e074c3e8823 (diff) |
agp: Switch agp_{un,}map_page() to take struct page * argument
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Diffstat (limited to 'drivers/char/agp/intel-agp.c')
-rw-r--r-- | drivers/char/agp/intel-agp.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/char/agp/intel-agp.c b/drivers/char/agp/intel-agp.c index b8f2c75b98d1..148d7e38fddf 100644 --- a/drivers/char/agp/intel-agp.c +++ b/drivers/char/agp/intel-agp.c | |||
@@ -181,19 +181,19 @@ static struct _intel_private { | |||
181 | } intel_private; | 181 | } intel_private; |
182 | 182 | ||
183 | #ifdef USE_PCI_DMA_API | 183 | #ifdef USE_PCI_DMA_API |
184 | static int intel_agp_map_page(void *addr, dma_addr_t *ret) | 184 | static int intel_agp_map_page(struct page *page, dma_addr_t *ret) |
185 | { | 185 | { |
186 | *ret = pci_map_single(intel_private.pcidev, addr, | 186 | *ret = pci_map_page(intel_private.pcidev, page, 0, |
187 | PAGE_SIZE, PCI_DMA_BIDIRECTIONAL); | 187 | PAGE_SIZE, PCI_DMA_BIDIRECTIONAL); |
188 | if (pci_dma_mapping_error(intel_private.pcidev, *ret)) | 188 | if (pci_dma_mapping_error(intel_private.pcidev, *ret)) |
189 | return -EINVAL; | 189 | return -EINVAL; |
190 | return 0; | 190 | return 0; |
191 | } | 191 | } |
192 | 192 | ||
193 | static void intel_agp_unmap_page(void *addr, dma_addr_t dma) | 193 | static void intel_agp_unmap_page(struct page *page, dma_addr_t dma) |
194 | { | 194 | { |
195 | pci_unmap_single(intel_private.pcidev, dma, | 195 | pci_unmap_page(intel_private.pcidev, dma, |
196 | PAGE_SIZE, PCI_DMA_BIDIRECTIONAL); | 196 | PAGE_SIZE, PCI_DMA_BIDIRECTIONAL); |
197 | } | 197 | } |
198 | 198 | ||
199 | static int intel_agp_map_memory(struct agp_memory *mem) | 199 | static int intel_agp_map_memory(struct agp_memory *mem) |