diff options
| author | Tejun Heo <tj@kernel.org> | 2013-02-27 20:04:02 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-27 22:10:15 -0500 |
| commit | 615f2e5c531bc57d5a190f321d697988e950ae4d (patch) | |
| tree | 2073523a21a56ae4d6276e6e9e1526f4a056c996 | |
| parent | 56de210245487ef1f1416c8ec9e581ebdd0d32ec (diff) | |
dca: convert to idr_alloc()
Convert to the much saner new idr interface.
Signed-off-by: Tejun 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: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | drivers/dca/dca-sysfs.c | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/drivers/dca/dca-sysfs.c b/drivers/dca/dca-sysfs.c index 591b6597c00a..126cf295b198 100644 --- a/drivers/dca/dca-sysfs.c +++ b/drivers/dca/dca-sysfs.c | |||
| @@ -53,22 +53,19 @@ void dca_sysfs_remove_req(struct dca_provider *dca, int slot) | |||
| 53 | int dca_sysfs_add_provider(struct dca_provider *dca, struct device *dev) | 53 | int dca_sysfs_add_provider(struct dca_provider *dca, struct device *dev) |
| 54 | { | 54 | { |
| 55 | struct device *cd; | 55 | struct device *cd; |
| 56 | int err = 0; | 56 | int ret; |
| 57 | 57 | ||
| 58 | idr_try_again: | 58 | idr_preload(GFP_KERNEL); |
| 59 | if (!idr_pre_get(&dca_idr, GFP_KERNEL)) | ||
| 60 | return -ENOMEM; | ||
| 61 | spin_lock(&dca_idr_lock); | 59 | 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 | |||
| 63 | spin_unlock(&dca_idr_lock); | 65 | spin_unlock(&dca_idr_lock); |
| 64 | switch (err) { | 66 | idr_preload_end(); |
| 65 | case 0: | 67 | if (ret < 0) |
| 66 | break; | 68 | return ret; |
| 67 | case -EAGAIN: | ||
| 68 | goto idr_try_again; | ||
| 69 | default: | ||
| 70 | return err; | ||
| 71 | } | ||
| 72 | 69 | ||
| 73 | cd = device_create(dca_class, dev, MKDEV(0, 0), NULL, "dca%d", dca->id); | 70 | cd = device_create(dca_class, dev, MKDEV(0, 0), NULL, "dca%d", dca->id); |
| 74 | if (IS_ERR(cd)) { | 71 | if (IS_ERR(cd)) { |