Skip to content

Commit 615f2e5

Browse files
htejuntorvalds
authored andcommitted
dca: convert to idr_alloc()
Convert to the much saner new idr interface. Signed-off-by: Tejun Heo <[email protected]> Cc: Paul Gortmaker <[email protected]> Cc: Maciej Sosnowski <[email protected]> Cc: Shannon Nelson <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
1 parent 56de210 commit 615f2e5

File tree

1 file changed

+10
-13
lines changed

1 file changed

+10
-13
lines changed

drivers/dca/dca-sysfs.c

+10-13
Original file line numberDiff line numberDiff line change
@@ -53,22 +53,19 @@ void dca_sysfs_remove_req(struct dca_provider *dca, int slot)
5353
int dca_sysfs_add_provider(struct dca_provider *dca, struct device *dev)
5454
{
5555
struct device *cd;
56-
int err = 0;
56+
int ret;
5757

58-
idr_try_again:
59-
if (!idr_pre_get(&dca_idr, GFP_KERNEL))
60-
return -ENOMEM;
58+
idr_preload(GFP_KERNEL);
6159
spin_lock(&dca_idr_lock);
62-
err = idr_get_new(&dca_idr, dca, &dca->id);
60+
61+
ret = idr_alloc(&dca_idr, dca, 0, 0, GFP_NOWAIT);
62+
if (ret >= 0)
63+
dca->id = ret;
64+
6365
spin_unlock(&dca_idr_lock);
64-
switch (err) {
65-
case 0:
66-
break;
67-
case -EAGAIN:
68-
goto idr_try_again;
69-
default:
70-
return err;
71-
}
66+
idr_preload_end();
67+
if (ret < 0)
68+
return ret;
7269

7370
cd = device_create(dca_class, dev, MKDEV(0, 0), NULL, "dca%d", dca->id);
7471
if (IS_ERR(cd)) {

0 commit comments

Comments
 (0)