diff options
author | Stephen Hemminger <stephen@networkplumber.org> | 2014-04-07 18:38:52 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-07 19:36:07 -0400 |
commit | 90ae3ae539246984d36e43b0e23554bca941476f (patch) | |
tree | 9bd2b02cca89ce927249b5dbe6fcf5bebd1e3b87 /include/linux/idr.h | |
parent | c4082f36fa3eeb5d4fadc50241b6e3a388561f80 (diff) |
idr: remove dead code
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>
Diffstat (limited to 'include/linux/idr.h')
-rw-r--r-- | include/linux/idr.h | 63 |
1 files changed, 0 insertions, 63 deletions
diff --git a/include/linux/idr.h b/include/linux/idr.h index f669585c4fc5..6af3400b9b2f 100644 --- a/include/linux/idr.h +++ b/include/linux/idr.h | |||
@@ -133,69 +133,6 @@ static inline void *idr_find(struct idr *idr, int id) | |||
133 | for (id = 0; ((entry) = idr_get_next(idp, &(id))) != NULL; ++id) | 133 | for (id = 0; ((entry) = idr_get_next(idp, &(id))) != NULL; ++id) |
134 | 134 | ||
135 | /* | 135 | /* |
136 | * Don't use the following functions. These exist only to suppress | ||
137 | * deprecated warnings on EXPORT_SYMBOL()s. | ||
138 | */ | ||
139 | int __idr_pre_get(struct idr *idp, gfp_t gfp_mask); | ||
140 | int __idr_get_new_above(struct idr *idp, void *ptr, int starting_id, int *id); | ||
141 | void __idr_remove_all(struct idr *idp); | ||
142 | |||
143 | /** | ||
144 | * idr_pre_get - reserve resources for idr allocation | ||
145 | * @idp: idr handle | ||
146 | * @gfp_mask: memory allocation flags | ||
147 | * | ||
148 | * Part of old alloc interface. This is going away. Use | ||
149 | * idr_preload[_end]() and idr_alloc() instead. | ||
150 | */ | ||
151 | static inline int __deprecated idr_pre_get(struct idr *idp, gfp_t gfp_mask) | ||
152 | { | ||
153 | return __idr_pre_get(idp, gfp_mask); | ||
154 | } | ||
155 | |||
156 | /** | ||
157 | * idr_get_new_above - allocate new idr entry above or equal to a start id | ||
158 | * @idp: idr handle | ||
159 | * @ptr: pointer you want associated with the id | ||
160 | * @starting_id: id to start search at | ||
161 | * @id: pointer to the allocated handle | ||
162 | * | ||
163 | * Part of old alloc interface. This is going away. Use | ||
164 | * idr_preload[_end]() and idr_alloc() instead. | ||
165 | */ | ||
166 | static inline int __deprecated idr_get_new_above(struct idr *idp, void *ptr, | ||
167 | int starting_id, int *id) | ||
168 | { | ||
169 | return __idr_get_new_above(idp, ptr, starting_id, id); | ||
170 | } | ||
171 | |||
172 | /** | ||
173 | * idr_get_new - allocate new idr entry | ||
174 | * @idp: idr handle | ||
175 | * @ptr: pointer you want associated with the id | ||
176 | * @id: pointer to the allocated handle | ||
177 | * | ||
178 | * Part of old alloc interface. This is going away. Use | ||
179 | * idr_preload[_end]() and idr_alloc() instead. | ||
180 | */ | ||
181 | static inline int __deprecated idr_get_new(struct idr *idp, void *ptr, int *id) | ||
182 | { | ||
183 | return __idr_get_new_above(idp, ptr, 0, id); | ||
184 | } | ||
185 | |||
186 | /** | ||
187 | * idr_remove_all - remove all ids from the given idr tree | ||
188 | * @idp: idr handle | ||
189 | * | ||
190 | * If you're trying to destroy @idp, calling idr_destroy() is enough. | ||
191 | * This is going away. Don't use. | ||
192 | */ | ||
193 | static inline void __deprecated idr_remove_all(struct idr *idp) | ||
194 | { | ||
195 | __idr_remove_all(idp); | ||
196 | } | ||
197 | |||
198 | /* | ||
199 | * IDA - IDR based id allocator, use when translation from id to | 136 | * IDA - IDR based id allocator, use when translation from id to |
200 | * pointer isn't necessary. | 137 | * pointer isn't necessary. |
201 | * | 138 | * |