Update of /cvsroot/alsa/alsa-kernel/pci/rme9652
In directory sc8-pr-cvs1:/tmp/cvs-serv3539
Modified Files:
hammerfall_mem.c
Log Message:
2.5 cleanups
Index: hammerfall_mem.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/pci/rme9652/hammerfall_mem.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- hammerfall_mem.c 25 Feb 2003 13:35:44 -0000 1.8
+++ hammerfall_mem.c 31 May 2003 11:33:57 -0000 1.9
@@ -98,15 +98,7 @@
{
void *res;
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2, 3, 0)
res = (void *) pci_alloc_consistent(pci, size, dmaaddr);
-#else
- int pg;
- for (pg = 0; PAGE_SIZE * (1 << pg) < size; pg++);
- res = (void *)__get_free_pages(GFP_KERNEL, pg);
- if (res != NULL)
- *dmaaddr = virt_to_bus(res);
-#endif
if (res != NULL) {
struct page *page = virt_to_page(res);
struct page *last_page = page + (size + PAGE_SIZE - 1) / PAGE_SIZE;
@@ -127,19 +119,7 @@
last_page = virt_to_page(ptr) + (size + PAGE_SIZE - 1) / PAGE_SIZE;
while (page < last_page)
clear_bit(PG_reserved, &(page++)->flags);
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2, 3, 0)
pci_free_consistent(pci, size, ptr, dmaaddr);
-#else
- {
- int pg;
- for (pg = 0; PAGE_SIZE * (1 << pg) < size; pg++);
- if (bus_to_virt(dmaaddr) != ptr) {
- printk(KERN_ERR "hammerfall_free_pages: dmaaddr != ptr\n");
- return;
- }
- free_pages((unsigned long)ptr, pg);
- }
-#endif
}
void *snd_hammerfall_get_buffer (struct pci_dev *pcidev, dma_addr_t *dmaaddr)
-------------------------------------------------------
This SF.net email is sponsored by: eBay
Get office equipment for less on eBay!
http://adfarm.mediaplex.com/ad/ck/711-11697-6916-5
_______________________________________________
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
