Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 9f12563db1e079aaf9821104e6dfff4873b3f4b6

Authored by Tejun Heo
Committed by Linus Torvalds
1 parent 7b51f47835
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

mfd: convert to idr_alloc() 

Convert to the much saner new idr interface.

Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Samuel Ortiz <sameo@linux.intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 1 changed file with 6 additions and 7 deletions Side-by-side Diff

drivers/mfd/rtsx_pcr.c
Diff comments   View file @ 9f12563
... ... @@ -1091,15 +1091,14 @@
1091 1091 }
1092 1092 handle->pcr = pcr;
1093 1093  
1094   - if (!idr_pre_get(&rtsx_pci_idr, GFP_KERNEL)) {
1095   - ret = -ENOMEM;
1096   - goto free_handle;
1097   - }
1098   -
  1094 + idr_preload(GFP_KERNEL);
1099 1095 spin_lock(&rtsx_pci_lock);
1100   - ret = idr_get_new(&rtsx_pci_idr, pcr, &pcr->id);
  1096 + ret = idr_alloc(&rtsx_pci_idr, pcr, 0, 0, GFP_NOWAIT);
  1097 + if (ret >= 0)
  1098 + pcr->id = ret;
1101 1099 spin_unlock(&rtsx_pci_lock);
1102   - if (ret)
  1100 + idr_preload_end();
  1101 + if (ret < 0)
1103 1102 goto free_handle;
1104 1103  
1105 1104 pcr->pci = pcidev;