Commit 485258b4 authored by Matthew Wilcox's avatar Matthew Wilcox

dmaengine: Convert to new IDA API

Simpler and shorter code.
Signed-off-by: default avatarMatthew Wilcox <willy@infradead.org>
Acked-by: default avatarVinod Koul <vkoul@kernel.org>
parent cd38049e
...@@ -161,9 +161,7 @@ static void chan_dev_release(struct device *dev) ...@@ -161,9 +161,7 @@ static void chan_dev_release(struct device *dev)
chan_dev = container_of(dev, typeof(*chan_dev), device); chan_dev = container_of(dev, typeof(*chan_dev), device);
if (atomic_dec_and_test(chan_dev->idr_ref)) { if (atomic_dec_and_test(chan_dev->idr_ref)) {
mutex_lock(&dma_list_mutex); ida_free(&dma_ida, chan_dev->dev_id);
ida_remove(&dma_ida, chan_dev->dev_id);
mutex_unlock(&dma_list_mutex);
kfree(chan_dev->idr_ref); kfree(chan_dev->idr_ref);
} }
kfree(chan_dev); kfree(chan_dev);
...@@ -896,17 +894,12 @@ static bool device_has_all_tx_types(struct dma_device *device) ...@@ -896,17 +894,12 @@ static bool device_has_all_tx_types(struct dma_device *device)
static int get_dma_id(struct dma_device *device) static int get_dma_id(struct dma_device *device)
{ {
int rc; int rc = ida_alloc(&dma_ida, GFP_KERNEL);
do {
if (!ida_pre_get(&dma_ida, GFP_KERNEL))
return -ENOMEM;
mutex_lock(&dma_list_mutex);
rc = ida_get_new(&dma_ida, &device->dev_id);
mutex_unlock(&dma_list_mutex);
} while (rc == -EAGAIN);
if (rc < 0)
return rc; return rc;
device->dev_id = rc;
return 0;
} }
/** /**
...@@ -1090,9 +1083,7 @@ int dma_async_device_register(struct dma_device *device) ...@@ -1090,9 +1083,7 @@ int dma_async_device_register(struct dma_device *device)
err_out: err_out:
/* if we never registered a channel just release the idr */ /* if we never registered a channel just release the idr */
if (atomic_read(idr_ref) == 0) { if (atomic_read(idr_ref) == 0) {
mutex_lock(&dma_list_mutex); ida_free(&dma_ida, device->dev_id);
ida_remove(&dma_ida, device->dev_id);
mutex_unlock(&dma_list_mutex);
kfree(idr_ref); kfree(idr_ref);
return rc; return rc;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment