GitHub-Mirror/linux-bl808
2
0
Fork 0
mirror of https://github.com/Fishwaldo/linux-bl808.git synced 2025-03-30 10:55:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

idr: remove dead code

Browse source 
Remove no longer used deprecated code, and make local functions
static.

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
Acked-by: Jean Delvare <jdelvare@suse.de>
Acked-by: Tejun Heo <tj@kernel.org>
Cc: Jeff Layton <jlayton@redhat.com>
Cc: Philipp Reisner <philipp.reisner@linbit.com>
Cc: Jens Axboe <axboe@kernel.dk>
Cc: George Spelvin <linux@horizon.com>
Cc: Randy Dunlap <rdunlap@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Stephen Hemminger 2014-04-07 15:38:52 -07:00 • committed by Linus Torvalds
parent c4082f36fa
commit 90ae3ae539
2 changed files with 2 additions and 81 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

63
include/linux/idr.h
View file

@ -132,69 +132,6 @@ static inline void *idr_find(struct idr *idr, int id)
#define idr_for_each_entry(idp, entry, id) \ #define idr_for_each_entry(idp, entry, id) \
for (id = 0; ((entry) = idr_get_next(idp, &(id))) != NULL; ++id) for (id = 0; ((entry) = idr_get_next(idp, &(id))) != NULL; ++id)
/*
* Don't use the following functions. These exist only to suppress
* deprecated warnings on EXPORT_SYMBOL()s.
*/
int __idr_pre_get(struct idr *idp, gfp_t gfp_mask);
int __idr_get_new_above(struct idr *idp, void *ptr, int starting_id, int *id);
void __idr_remove_all(struct idr *idp);
/**
* idr_pre_get - reserve resources for idr allocation
* @idp: idr handle
* @gfp_mask: memory allocation flags
*
* Part of old alloc interface. This is going away. Use
* idr_preload[_end]() and idr_alloc() instead.
*/
static inline int __deprecated idr_pre_get(struct idr *idp, gfp_t gfp_mask)
{
return __idr_pre_get(idp, gfp_mask);
}
/**
* idr_get_new_above - allocate new idr entry above or equal to a start id
* @idp: idr handle
* @ptr: pointer you want associated with the id
* @starting_id: id to start search at
* @id: pointer to the allocated handle
*
* Part of old alloc interface. This is going away. Use
* idr_preload[_end]() and idr_alloc() instead.
*/
static inline int __deprecated idr_get_new_above(struct idr *idp, void *ptr,
int starting_id, int *id)
{
return __idr_get_new_above(idp, ptr, starting_id, id);
}
/**
* idr_get_new - allocate new idr entry
* @idp: idr handle
* @ptr: pointer you want associated with the id
* @id: pointer to the allocated handle
*
* Part of old alloc interface. This is going away. Use
* idr_preload[_end]() and idr_alloc() instead.
*/
static inline int __deprecated idr_get_new(struct idr *idp, void *ptr, int *id)
{
return __idr_get_new_above(idp, ptr, 0, id);
}
/**
* idr_remove_all - remove all ids from the given idr tree
* @idp: idr handle
*
* If you're trying to destroy @idp, calling idr_destroy() is enough.
* This is going away. Don't use.
*/
static inline void __deprecated idr_remove_all(struct idr *idp)
{
__idr_remove_all(idp);
}
/* /*
* IDA - IDR based id allocator, use when translation from id to * IDA - IDR based id allocator, use when translation from id to
* pointer isn't necessary. * pointer isn't necessary.

20
lib/idr.c
View file

@ -196,7 +196,7 @@ static void idr_mark_full(struct idr_layer **pa, int id)
} }
} }
int __idr_pre_get(struct idr *idp, gfp_t gfp_mask) static int __idr_pre_get(struct idr *idp, gfp_t gfp_mask)
{ {
while (idp->id_free_cnt < MAX_IDR_FREE) { while (idp->id_free_cnt < MAX_IDR_FREE) {
struct idr_layer *new; struct idr_layer *new;
@ -207,7 +207,6 @@ int __idr_pre_get(struct idr *idp, gfp_t gfp_mask)
} }
return 1; return 1;
} }
EXPORT_SYMBOL(__idr_pre_get);
/** /**
* sub_alloc - try to allocate an id without growing the tree depth * sub_alloc - try to allocate an id without growing the tree depth
@ -374,20 +373,6 @@ static void idr_fill_slot(struct idr *idr, void *ptr, int id,
idr_mark_full(pa, id); idr_mark_full(pa, id);
} }
int __idr_get_new_above(struct idr *idp, void *ptr, int starting_id, int *id)
{
struct idr_layer *pa[MAX_IDR_LEVEL + 1];
int rv;
rv = idr_get_empty_slot(idp, starting_id, pa, 0, idp);
if (rv < 0)
return rv == -ENOMEM ? -EAGAIN : rv;
idr_fill_slot(idp, ptr, rv, pa);
*id = rv;
return 0;
}
EXPORT_SYMBOL(__idr_get_new_above);
/** /**
* idr_preload - preload for idr_alloc() * idr_preload - preload for idr_alloc()
@ -607,7 +592,7 @@ void idr_remove(struct idr *idp, int id)
} }
EXPORT_SYMBOL(idr_remove); EXPORT_SYMBOL(idr_remove);
void __idr_remove_all(struct idr *idp) static void __idr_remove_all(struct idr *idp)
{ {
int n, id, max; int n, id, max;
int bt_mask; int bt_mask;
@ -640,7 +625,6 @@ void __idr_remove_all(struct idr *idp)
} }
idp->layers = 0; idp->layers = 0;
} }
EXPORT_SYMBOL(__idr_remove_all);
/** /**
* idr_destroy - release all cached layers within an idr tree * idr_destroy - release all cached layers within an idr tree