git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx
[pandora-kernel.git]
/
drivers
/
dma
/
dmaengine.c
diff --git
a/drivers/dma/dmaengine.c
b/drivers/dma/dmaengine.c
index
48694c3
..
b48967b
100644
(file)
--- a/
drivers/dma/dmaengine.c
+++ b/
drivers/dma/dmaengine.c
@@
-62,9
+62,9
@@
#include <linux/slab.h>
static DEFINE_MUTEX(dma_list_mutex);
#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 LIST_HEAD(dma_device_list);
static long dmaengine_ref_count;
-static struct idr dma_idr;
/* --- sysfs implementation --- */
/* --- sysfs implementation --- */
@@
-510,8
+510,8
@@
struct dma_chan *__dma_request_channel(dma_cap_mask_t *mask, dma_filter_fn fn, v
dma_chan_name(chan));
list_del_rcu(&device->global_node);
} else if (err)
dma_chan_name(chan));
list_del_rcu(&device->global_node);
} else if (err)
- pr_
err
("dmaengine: failed to get %s: (%d)\n",
- dma_chan_name(chan), err);
+ pr_
debug
("dmaengine: failed to get %s: (%d)\n",
+
dma_chan_name(chan), err);
else
break;
if (--device->privatecnt == 0)
else
break;
if (--device->privatecnt == 0)
@@
-1050,8
+1050,6
@@
EXPORT_SYMBOL_GPL(dma_run_dependencies);
static int __init dma_bus_init(void)
{
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);
return class_register(&dma_devclass);
}
arch_initcall(dma_bus_init);