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

Commit 6d770931 authored by Tejun Heo's avatar Tejun Heo Committed by Linus Torvalds
Browse files

uio: convert to idr_alloc() 



Convert to the much saner new idr interface.

Signed-off-by: default avatarTejun Heo <tj@kernel.org>
Acked-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: "Hans J. Koch" <hjk@hansjkoch.de>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 6deb69fa

drivers/uio/uio.c

+4 −15
Original line number Diff line number Diff line
@@ -369,26 +369,15 @@ static void uio_dev_del_attributes(struct uio_device *idev) 
static int uio_get_minor(struct uio_device *idev)

{

	int retval = -ENOMEM;

	int id;



	mutex_lock(&minor_lock);

	if (idr_pre_get(&uio_idr, GFP_KERNEL) == 0)

		goto exit;



	retval = idr_get_new(&uio_idr, idev, &id);

	if (retval < 0) {

		if (retval == -EAGAIN)

			retval = -ENOMEM;

		goto exit;

	}

	if (id < UIO_MAX_DEVICES) {

		idev->minor = id;

	} else {

	retval = idr_alloc(&uio_idr, idev, 0, UIO_MAX_DEVICES, GFP_KERNEL);

	if (retval >= 0) {

		idev->minor = retval;

	} else if (retval == -ENOSPC) {

		dev_err(idev->dev, "too many uio devices\n");

		retval = -EINVAL;

		idr_remove(&uio_idr, id);

	}

exit:

	mutex_unlock(&minor_lock);

	return retval;

}