These are no longer used anywhere, remove them; update the
nvmem-prodiver.h to refer to ida_alloc() which is what is used now
(see drivers/nvmem/core.c).
Signed-off-by: Stephen Kitt <steve@xxxxxxx>
---
include/linux/idr.h | 8 --------
include/linux/nvmem-provider.h | 2 +-
2 files changed, 1 insertion(+), 9 deletions(-)
diff --git a/include/linux/idr.h b/include/linux/idr.h
index a0dce14090a9..273b2158a428 100644
--- a/include/linux/idr.h
+++ b/include/linux/idr.h
@@ -314,14 +314,6 @@ static inline void ida_init(struct ida *ida)
xa_init_flags(&ida->xa, IDA_INIT_FLAGS);
}
-/*
- * ida_simple_get() and ida_simple_remove() are deprecated. Use
- * ida_alloc() and ida_free() instead respectively.
- */
-#define ida_simple_get(ida, start, end, gfp) \
- ida_alloc_range(ida, start, (end) - 1, gfp)
-#define ida_simple_remove(ida, id) ida_free(ida, id)
-
static inline bool ida_is_empty(const struct ida *ida)
{
return xa_empty(&ida->xa);
diff --git a/include/linux/nvmem-provider.h b/include/linux/nvmem-provider.h
index c9a3ac9efeaa..e957cdc56619 100644
--- a/include/linux/nvmem-provider.h
+++ b/include/linux/nvmem-provider.h
@@ -75,7 +75,7 @@ struct nvmem_keepout {
*
* Note: A default "nvmem<id>" name will be assigned to the device if
* no name is specified in its configuration. In such case "<id>" is
- * generated with ida_simple_get() and provided id field is ignored.
+ * generated with ida_alloc() and provided id field is ignored.
*
* Note: Specifying name and setting id to -1 implies a unique device
* whose name is provided as-is (kept unaltered).
base-commit: 5191290407668028179f2544a11ae9b57f0bcf07
--
2.30.2
