diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-04 16:43:43 -1000 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-04 16:43:43 -1000 |
| commit | 7f3bf7cd348cead84f8027b32aa30ea49fa64df5 (patch) | |
| tree | d2f68190c64a7598fff040a8895103031551e2f2 /drivers/dma/dmaengine.c | |
| parent | cbc158d6bfa1990f7869717bb5270867c66068d1 (diff) | |
| parent | 21ef4b8b7a7d59a995bf44382de38c95587767d4 (diff) | |
| download | linux-3.10-7f3bf7cd348cead84f8027b32aa30ea49fa64df5.tar.gz linux-3.10-7f3bf7cd348cead84f8027b32aa30ea49fa64df5.tar.bz2 linux-3.10-7f3bf7cd348cead84f8027b32aa30ea49fa64df5.zip | |
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx
* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx:
dmaengine: use DEFINE_IDR for static initialization
ioat: fix xor_idx_to_desc
Avoid section type conflict in dma/ioat/dma_v3.c
ioat: Adding PCI IDs for IOAT devices on SandyBridge platforms
Diffstat (limited to 'drivers/dma/dmaengine.c')
| -rw-r--r-- | drivers/dma/dmaengine.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/dma/dmaengine.c b/drivers/dma/dmaengine.c index 26374b2a55a..b48967b499d 100644 --- a/drivers/dma/dmaengine.c +++ b/drivers/dma/dmaengine.c @@ -62,9 +62,9 @@ #include <linux/slab.h> static DEFINE_MUTEX(dma_list_mutex); +static DEFINE_IDR(dma_idr); static LIST_HEAD(dma_device_list); static long dmaengine_ref_count; -static struct idr dma_idr; /* --- sysfs implementation --- */ @@ -1050,8 +1050,6 @@ EXPORT_SYMBOL_GPL(dma_run_dependencies); static int __init dma_bus_init(void) { - idr_init(&dma_idr); - mutex_init(&dma_list_mutex); return class_register(&dma_devclass); } arch_initcall(dma_bus_init); |