summaryrefslogtreecommitdiffstats
path: root/include/linux/idr.h
diff options
context:
space:
mode:
authorMatthew Wilcox <mawilcox@microsoft.com>2017-11-28 09:48:43 -0500
committerMatthew Wilcox <mawilcox@microsoft.com>2018-02-06 16:40:31 -0500
commit9c160941403ba833c8e67981806ccae73ff7aca7 (patch)
tree0c84ab081d997296163970f22097a981c6a3ca37 /include/linux/idr.h
parent6e6d301490936789ff57daaaaf63f44d928a4028 (diff)
downloadlinux-stable-9c160941403ba833c8e67981806ccae73ff7aca7.tar.gz
linux-stable-9c160941403ba833c8e67981806ccae73ff7aca7.tar.bz2
linux-stable-9c160941403ba833c8e67981806ccae73ff7aca7.zip
idr: Delete idr_remove_ext function
Simply changing idr_remove's 'id' argument to 'unsigned long' suffices for all callers. Signed-off-by: Matthew Wilcox <mawilcox@microsoft.com>
Diffstat (limited to 'include/linux/idr.h')
-rw-r--r--include/linux/idr.h7
1 files changed, 1 insertions, 6 deletions
diff --git a/include/linux/idr.h b/include/linux/idr.h
index fa14f834e4ed..118987a17ada 100644
--- a/include/linux/idr.h
+++ b/include/linux/idr.h
@@ -140,16 +140,11 @@ void *idr_replace(struct idr *, void *, int id);
void *idr_replace_ext(struct idr *idr, void *ptr, unsigned long id);
void idr_destroy(struct idr *);
-static inline void *idr_remove_ext(struct idr *idr, unsigned long id)
+static inline void *idr_remove(struct idr *idr, unsigned long id)
{
return radix_tree_delete_item(&idr->idr_rt, id, NULL);
}
-static inline void *idr_remove(struct idr *idr, int id)
-{
- return idr_remove_ext(idr, id);
-}
-
static inline void idr_init(struct idr *idr)
{
INIT_RADIX_TREE(&idr->idr_rt, IDR_RT_MARKER);