From: Matthew Wilcox <willy@infradead.org> To: linux-kernel@vger.kernel.org Cc: Matthew Wilcox <willy@infradead.org>, Dan Williams <dan.j.williams@intel.com>, Vinod Koul <vkoul@kernel.org>, dmaengine@vger.kernel.org Subject: [16/26] dmaengine: Convert to new IDA API Date: Thu, 21 Jun 2018 14:28:25 -0700 [thread overview] Message-ID: <20180621212835.5636-17-willy@infradead.org> (raw) Simpler and shorter code. Signed-off-by: Matthew Wilcox <willy@infradead.org> --- drivers/dma/dmaengine.c | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/drivers/dma/dmaengine.c b/drivers/dma/dmaengine.c index 08ba8473a284..1e9bdadfc312 100644 --- a/drivers/dma/dmaengine.c +++ b/drivers/dma/dmaengine.c @@ -161,9 +161,7 @@ static void chan_dev_release(struct device *dev) chan_dev = container_of(dev, typeof(*chan_dev), device); if (atomic_dec_and_test(chan_dev->idr_ref)) { - mutex_lock(&dma_list_mutex); - ida_remove(&dma_ida, chan_dev->dev_id); - mutex_unlock(&dma_list_mutex); + ida_free(&dma_ida, chan_dev->dev_id); kfree(chan_dev->idr_ref); } kfree(chan_dev); @@ -896,16 +894,10 @@ static bool device_has_all_tx_types(struct dma_device *device) static int get_dma_id(struct dma_device *device) { - int rc; - - 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); + int rc = ida_alloc(&dma_ida, GFP_KERNEL); + if (rc >= 0) + device->dev_id = rc; return rc; } @@ -1090,9 +1082,7 @@ int dma_async_device_register(struct dma_device *device) err_out: /* if we never registered a channel just release the idr */ if (atomic_read(idr_ref) == 0) { - mutex_lock(&dma_list_mutex); - ida_remove(&dma_ida, device->dev_id); - mutex_unlock(&dma_list_mutex); + ida_free(&dma_ida, device->dev_id); kfree(idr_ref); return rc; }
WARNING: multiple messages have this Message-ID (diff)
From: Matthew Wilcox <willy@infradead.org> To: linux-kernel@vger.kernel.org Cc: Matthew Wilcox <willy@infradead.org>, Dan Williams <dan.j.williams@intel.com>, Vinod Koul <vkoul@kernel.org>, dmaengine@vger.kernel.org Subject: [PATCH 16/26] dmaengine: Convert to new IDA API Date: Thu, 21 Jun 2018 14:28:25 -0700 [thread overview] Message-ID: <20180621212835.5636-17-willy@infradead.org> (raw) In-Reply-To: <20180621212835.5636-1-willy@infradead.org> Simpler and shorter code. Signed-off-by: Matthew Wilcox <willy@infradead.org> --- drivers/dma/dmaengine.c | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/drivers/dma/dmaengine.c b/drivers/dma/dmaengine.c index 08ba8473a284..1e9bdadfc312 100644 --- a/drivers/dma/dmaengine.c +++ b/drivers/dma/dmaengine.c @@ -161,9 +161,7 @@ static void chan_dev_release(struct device *dev) chan_dev = container_of(dev, typeof(*chan_dev), device); if (atomic_dec_and_test(chan_dev->idr_ref)) { - mutex_lock(&dma_list_mutex); - ida_remove(&dma_ida, chan_dev->dev_id); - mutex_unlock(&dma_list_mutex); + ida_free(&dma_ida, chan_dev->dev_id); kfree(chan_dev->idr_ref); } kfree(chan_dev); @@ -896,16 +894,10 @@ static bool device_has_all_tx_types(struct dma_device *device) static int get_dma_id(struct dma_device *device) { - int rc; - - 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); + int rc = ida_alloc(&dma_ida, GFP_KERNEL); + if (rc >= 0) + device->dev_id = rc; return rc; } @@ -1090,9 +1082,7 @@ int dma_async_device_register(struct dma_device *device) err_out: /* if we never registered a channel just release the idr */ if (atomic_read(idr_ref) == 0) { - mutex_lock(&dma_list_mutex); - ida_remove(&dma_ida, device->dev_id); - mutex_unlock(&dma_list_mutex); + ida_free(&dma_ida, device->dev_id); kfree(idr_ref); return rc; } -- 2.17.1
next reply other threads:[~2018-06-21 21:28 UTC|newest] Thread overview: 68+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-06-21 21:28 Matthew Wilcox [this message] 2018-06-21 21:28 ` [PATCH 16/26] dmaengine: Convert to new IDA API Matthew Wilcox -- strict thread matches above, loose matches on Subject: below -- 2018-06-26 23:00 [16/26] " Matthew Wilcox 2018-06-26 23:00 ` [PATCH 16/26] " Matthew Wilcox 2018-06-24 7:57 [16/26] " Lars-Peter Clausen 2018-06-24 7:57 ` [PATCH 16/26] " Lars-Peter Clausen 2018-06-23 23:06 [16/26] " Matthew Wilcox 2018-06-23 23:06 ` [PATCH 16/26] " Matthew Wilcox 2018-06-23 12:30 [16/26] " Vinod Koul 2018-06-23 12:30 ` [PATCH 16/26] " Vinod 2018-06-21 21:28 [PATCH 00/26] New " Matthew Wilcox 2018-06-21 21:28 ` [PATCH 01/26] radix tree test suite: fix build Matthew Wilcox 2018-06-21 21:28 ` [PATCH 02/26] ida: Lock the IDA in ida_destroy Matthew Wilcox 2018-06-21 21:28 ` [PATCH 03/26] ida: Add new API Matthew Wilcox 2018-06-21 21:28 ` [PATCH 04/26] mtip32xx: Convert to new IDA API Matthew Wilcox 2018-06-25 8:20 ` Johannes Thumshirn 2018-06-25 8:20 ` Johannes Thumshirn 2018-06-21 21:28 ` [PATCH 05/26] fs: Convert unnamed_dev_ida to new API Matthew Wilcox 2018-06-22 19:45 ` Randy Dunlap 2018-06-22 21:12 ` Matthew Wilcox 2018-06-21 21:28 ` [PATCH 06/26] fs: Convert namespace IDAs " Matthew Wilcox 2018-06-21 21:28 ` [PATCH 07/26] devpts: Convert to new IDA API Matthew Wilcox 2018-06-21 21:28 ` [PATCH 08/26] sd: Convert to new IDA interface Matthew Wilcox 2018-06-21 21:28 ` [PATCH 09/26] osd: Convert to new IDA API Matthew Wilcox 2018-06-21 21:28 ` [PATCH 10/26] rsxx: " Matthew Wilcox 2018-06-21 21:28 ` [PATCH 11/26] cb710: " Matthew Wilcox 2018-06-21 21:33 ` Michał Mirosław 2018-06-21 21:28 ` [PATCH 12/26] Convert net_namespace " Matthew Wilcox 2018-06-21 21:28 ` [PATCH 13/26] ppc: Convert mmu context allocation " Matthew Wilcox 2018-06-22 2:15 ` Nicholas Piggin 2018-06-22 4:38 ` Matthew Wilcox 2018-06-22 4:53 ` Nicholas Piggin 2018-06-22 5:47 ` Aneesh Kumar K.V 2018-06-22 5:47 ` Aneesh Kumar K.V 2018-06-21 21:28 ` [PATCH 14/26] media: Convert entity ID " Matthew Wilcox 2018-07-24 11:05 ` Sakari Ailus 2018-07-30 14:55 ` Mauro Carvalho Chehab 2018-07-31 18:16 ` Matthew Wilcox 2018-06-21 21:28 ` [PATCH 15/26] ppc: Convert vas " Matthew Wilcox 2018-07-05 12:17 ` Matthew Wilcox 2018-06-21 21:28 ` [PATCH 17/26] drm/vmwgfx: Convert " Matthew Wilcox 2018-06-21 21:28 ` [PATCH 18/26] target/iscsi: Allocate session IDs from an IDA Matthew Wilcox 2018-06-21 21:28 ` Matthew Wilcox 2018-07-26 16:48 ` Mike Christie 2018-07-26 16:48 ` Mike Christie 2018-07-26 16:50 ` Mike Christie 2018-07-26 16:50 ` Mike Christie 2018-07-26 17:13 ` Mike Christie 2018-07-26 17:13 ` Mike Christie 2018-07-26 17:13 ` Mike Christie 2018-07-27 19:38 ` Matthew Wilcox 2018-07-27 19:38 ` Matthew Wilcox 2018-07-27 21:05 ` Mike Christie 2018-07-27 21:05 ` Mike Christie 2018-07-31 2:03 ` Martin K. Petersen 2018-07-31 2:03 ` Martin K. Petersen 2018-07-31 18:15 ` Matthew Wilcox 2018-07-31 18:15 ` Matthew Wilcox 2018-07-31 18:55 ` Mike Christie 2018-07-31 18:55 ` Mike Christie 2018-06-21 21:28 ` [PATCH 19/26] ida: Start new test_ida module Matthew Wilcox 2018-06-21 21:28 ` [PATCH 20/26] idr-test: Convert ida_check_nomem to new API Matthew Wilcox 2018-06-21 21:28 ` [PATCH 21/26] test_ida: Move ida_check_leaf Matthew Wilcox 2018-06-21 21:28 ` [PATCH 22/26] test_ida: Move ida_check_max Matthew Wilcox 2018-06-21 21:28 ` [PATCH 23/26] test_ida: Convert check_ida_conv to new API Matthew Wilcox 2018-06-21 21:28 ` [PATCH 24/26] test_ida: check_ida_destroy and check_ida_alloc Matthew Wilcox 2018-06-21 21:28 ` [PATCH 25/26] ida: Remove old API Matthew Wilcox 2018-06-21 21:28 ` [PATCH 26/26] ida: Change ida_get_new_above to return the id Matthew Wilcox
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20180621212835.5636-17-willy@infradead.org \ --to=willy@infradead.org \ --cc=dan.j.williams@intel.com \ --cc=dmaengine@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=vkoul@kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.