Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 69ee266b authored by Tejun Heo's avatar Tejun Heo Committed by Linus Torvalds
Browse files

dmaengine: convert to idr_alloc() 



Convert to the much saner new idr interface.

Signed-off-by: default avatarTejun Heo <tj@kernel.org>
Cc: Dan Williams <djbw@fb.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 615f2e5c

drivers/dma/dmaengine.c

+6 −10
Original line number Diff line number Diff line
@@ -686,18 +686,14 @@ static int get_dma_id(struct dma_device *device) 
{

	int rc;



 idr_retry:

	if (!idr_pre_get(&dma_idr, GFP_KERNEL))

		return -ENOMEM;

	mutex_lock(&dma_list_mutex);

	rc = idr_get_new(&dma_idr, NULL, &device->dev_id);

	mutex_unlock(&dma_list_mutex);

	if (rc == -EAGAIN)

		goto idr_retry;

	else if (rc != 0)

		return rc;



	return 0;

	rc = idr_alloc(&dma_idr, NULL, 0, 0, GFP_KERNEL);

	if (rc >= 0)

		device->dev_id = rc;



	mutex_unlock(&dma_list_mutex);

	return rc < 0 ? rc : 0;

}



/**