[PATCH 3/3] Replace pci_pool with generic dma_pool
From: Deepak Saxena (dsaxena_at_plexity.net)
Date: 01/31/04
- Previous message: Greg KH: "Re: [PATCH] PCI Update for 2.6.2-rc2"
- In reply to: Deepak Saxena: "[PATCH] Replace pci_pool with generic dma_pool"
- Next in thread: Greg KH: "Re: [PATCH] Replace pci_pool with generic dma_pool"
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Date: Fri, 30 Jan 2004 17:41:40 -0700 To: torvalds@osdl.org, akpm@osdl.org
include/linux changes:
- Add dma_pools member to struct device
- Add include/linux/dmapool.h
- Remove pools memober from struct pci_dev
- Replace pci_pool_* functions with macros that map to dma_pool_* functions
diff -Nru a/include/linux/device.h b/include/linux/device.h
--- a/include/linux/device.h Fri Jan 30 12:20:30 2004
+++ b/include/linux/device.h Fri Jan 30 12:20:30 2004
@@ -284,6 +284,7 @@
detached from its driver. */
u64 *dma_mask; /* dma mask (if dma'able device) */
+ struct list_head dma_pools; /* dma pools (if dma'ble) */
void (*release)(struct device * dev);
};
diff -Nru a/include/linux/dmapool.h b/include/linux/dmapool.h
--- /dev/null Wed Dec 31 16:00:00 1969
+++ b/include/linux/dmapool.h Fri Jan 30 12:20:30 2004
@@ -0,0 +1,27 @@
+/*
+ * include/linux/dmapool.h
+ *
+ * Allocation pools for DMAable (coherent) memory.
+ *
+ * This file is licensed under the terms of the GNU General Public
+ * License version 2. This program is licensed "as is" without any
+ * warranty of any kind, whether express or implied.
+ */
+
+#ifndef LINUX_DMAPOOL_H
+#define LINUX_DMAPOOL_H
+
+#include <asm/io.h>
+#include <asm/scatterlist.h>
+
+struct dma_pool *dma_pool_create(const char *name, struct device *dev,
+ size_t size, size_t align, size_t allocation);
+
+void dma_pool_destroy(struct dma_pool *pool);
+
+void *dma_pool_alloc(struct dma_pool *pool, int mem_flags, dma_addr_t *handle);
+
+void dma_pool_free(struct dma_pool *pool, void *vaddr, dma_addr_t addr);
+
+#endif
+
diff -Nru a/include/linux/pci.h b/include/linux/pci.h
--- a/include/linux/pci.h Fri Jan 30 12:20:30 2004
+++ b/include/linux/pci.h Fri Jan 30 12:20:30 2004
@@ -393,7 +393,6 @@
0xffffffff. You only need to change
this if your device has broken DMA
or supports 64-bit transfers. */
- struct list_head pools; /* pci_pools tied to this device */
u64 consistent_dma_mask;/* Like dma_mask, but for
pci_alloc_consistent mappings as
@@ -689,12 +688,15 @@
int pci_scan_bridge(struct pci_bus *bus, struct pci_dev * dev, int max, int pass);
/* kmem_cache style wrapper around pci_alloc_consistent() */
-struct pci_pool *pci_pool_create (const char *name, struct pci_dev *dev,
- size_t size, size_t align, size_t allocation);
-void pci_pool_destroy (struct pci_pool *pool);
-void *pci_pool_alloc (struct pci_pool *pool, int flags, dma_addr_t *handle);
-void pci_pool_free (struct pci_pool *pool, void *vaddr, dma_addr_t addr);
+#include <linux/dmapool.h>
+
+#define pci_pool dma_pool
+#define pci_pool_create(name, pdev, size, align, allocation) \
+ dma_pool_create(name, &pdev->dev, size, align, allocation)
+#define pci_pool_destroy(pool) dma_pool_destroy(pool)
+#define pci_pool_alloc(pool, flags, handle) dma_pool_alloc(pool, flags, handle)
+#define pci_pool_free(pool, vaddr, addr) dma_pool_free(pool, vaddr, addr)
#if defined(CONFIG_ISA) || defined(CONFIG_EISA)
extern struct pci_dev *isa_bridge;
-- Deepak Saxena - dsaxena@plexity.net - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
- Previous message: Greg KH: "Re: [PATCH] PCI Update for 2.6.2-rc2"
- In reply to: Deepak Saxena: "[PATCH] Replace pci_pool with generic dma_pool"
- Next in thread: Greg KH: "Re: [PATCH] Replace pci_pool with generic dma_pool"
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Relevant Pages
|
|
