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

Commit 62f516b8 authored by Tejun Heo's avatar Tejun Heo Committed by Linus Torvalds
Browse files

gpio: convert to idr_alloc() 



Convert to the much saner new idr interface.

Signed-off-by: default avatarTejun Heo <tj@kernel.org>
Acked-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Cc: Grant Likely <grant.likely@secretlab.ca>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 37b61890

drivers/gpio/gpiolib.c

+3 −8
Original line number Diff line number Diff line
@@ -411,15 +411,10 @@ static int gpio_setup_irq(struct gpio_desc *desc, struct device *dev, 
			goto err_out;

		}



		do {

			ret = -ENOMEM;

			if (idr_pre_get(&dirent_idr, GFP_KERNEL))

				ret = idr_get_new_above(&dirent_idr, value_sd,

							1, &id);

		} while (ret == -EAGAIN);



		if (ret)

		ret = idr_alloc(&dirent_idr, value_sd, 1, 0, GFP_KERNEL);

		if (ret < 0)

			goto free_sd;

		id = ret;



		desc->flags &= GPIO_FLAGS_MASK;

		desc->flags |= (unsigned long)id << ID_SHIFT;