nvmem: switch to simpler IDA interface
PATCH 1/1 nvmem: switch to simpler IDA interface
From: Bartosz Golaszewski <[email protected]>
We don't need to specify any ranges when allocating IDs so we can switch to ida_alloc() and ida_free() instead of the ida_simple_ counterparts.
ida_simple_get(ida, 0, 0, gfp) is equivalent to ida_alloc_range(ida, 0, UINT_MAX, gfp) which is equivalent to ida_alloc(ida, gfp). Note: IDR will never actually allocate an ID larger than INT_MAX.
--- drivers/nvmem/core.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/nvmem/core.c +3 -3
@@ -321,7 +321,7 @@ static void nvmem_release(struct device *dev) {struct nvmem_device *nvmem =to_nvmem_device (dev); -ida_simple_remove (&nvmem_ida, nvmem->id); +ida_free (&nvmem_ida, nvmem->id);gpiod_put (nvmem->wp_gpio);kfree (nvmem); }
@@ -596,7 +596,7 @@ struct nvmem_device *nvmem_register(const struct nvmem_config *config)if (!nvmem)return ERR_PTR (-ENOMEM ); - rval =ida_simple_get (&nvmem_ida,0 ,0 ,GFP_KERNEL ); + rval =ida_alloc (&nvmem_ida,GFP_KERNEL );if (rval <0 ) {kfree (nvmem);return ERR_PTR (rval);
@@ -608,7 +608,7 @@ struct nvmem_device *nvmem_register(const struct nvmem_config *config) nvmem->wp_gpio =gpiod_get_optional (config->dev,"wp" ,GPIOD_OUT_HIGH );if (IS_ERR (nvmem->wp_gpio)) { -ida_simple_remove (&nvmem_ida, nvmem->id); +ida_free (&nvmem_ida, nvmem->id); rval =PTR_ERR (nvmem->wp_gpio);kfree (nvmem);return ERR_PTR (rval);
Signature · 1 line
2.17.1
Srinivas Kandagatla
AppliedQuoted 10 lines · Bartosz Golaszewski
From: Bartosz Golaszewski <[email protected]>
We don't need to specify any ranges when allocating IDs so we can switch to
ida_alloc()andida_free()instead of theida_simple_counterparts.
ida_simple_get(ida, 0, 0, gfp)is equivalent toida_alloc_range(ida, 0, UINT_MAX, gfp)which is equivalent toida_alloc(ida, gfp). Note: IDR will never actually allocate an ID larger thanINT_MAX.
Quoted 4 lines
Signed-off-by Bartosz Golaszewski <[email protected]>--- drivers/nvmem/core.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
thanks Applied!
--srini
Quoted 33 lines
drivers/nvmem/core.c +3
-3@@ -321,7 +321,7 @@ static void nvmem_release(struct device *dev) {struct nvmem_device *nvmem =to_nvmem_device (dev); -ida_simple_remove (&nvmem_ida, nvmem->id); +ida_free (&nvmem_ida, nvmem->id);gpiod_put (nvmem->wp_gpio);kfree (nvmem); }@@ -596,7 +596,7 @@ struct nvmem_device *nvmem_register(const struct nvmem_config *config)if (!nvmem)return ERR_PTR (-ENOMEM ); - rval =ida_simple_get (&nvmem_ida,0 ,0 ,GFP_KERNEL ); + rval =ida_alloc (&nvmem_ida,GFP_KERNEL );if (rval <0 ) {kfree (nvmem);return ERR_PTR (rval);@@ -608,7 +608,7 @@ struct nvmem_device *nvmem_register(const struct nvmem_config *config) nvmem->wp_gpio =gpiod_get_optional (config->dev,"wp" ,GPIOD_OUT_HIGH );if (IS_ERR (nvmem->wp_gpio)) { -ida_simple_remove (&nvmem_ida, nvmem->id); +ida_free (&nvmem_ida, nvmem->id); rval =PTR_ERR (nvmem->wp_gpio);kfree (nvmem);return ERR_PTR (rval);