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

Commit 615f2e5c authored by Tejun Heo's avatar Tejun Heo Committed by Linus Torvalds
Browse files

dca: convert to idr_alloc() 



Convert to the much saner new idr interface.

Signed-off-by: default avatarTejun Heo <tj@kernel.org>
Cc: Paul Gortmaker <paul.gortmaker@windriver.com>
Cc: Maciej Sosnowski <maciej.sosnowski@intel.com>
Cc: Shannon Nelson <shannon.nelson@intel.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 56de2102

drivers/dca/dca-sysfs.c

+10 −13
Original line number Diff line number Diff line
@@ -53,22 +53,19 @@ void dca_sysfs_remove_req(struct dca_provider *dca, int slot) 
int dca_sysfs_add_provider(struct dca_provider *dca, struct device *dev)

{

	struct device *cd;

	int err = 0;

	int ret;



idr_try_again:

	if (!idr_pre_get(&dca_idr, GFP_KERNEL))

		return -ENOMEM;

	idr_preload(GFP_KERNEL);

	spin_lock(&dca_idr_lock);

	err = idr_get_new(&dca_idr, dca, &dca->id);



	ret = idr_alloc(&dca_idr, dca, 0, 0, GFP_NOWAIT);

	if (ret >= 0)

		dca->id = ret;



	spin_unlock(&dca_idr_lock);

	switch (err) {

	case 0:

		break;

	case -EAGAIN:

		goto idr_try_again;

	default:

		return err;

	}

	idr_preload_end();

	if (ret < 0)

		return ret;



	cd = device_create(dca_class, dev, MKDEV(0, 0), NULL, "dca%d", dca->id);

	if (IS_ERR(cd)) {