From 11eb0432a54988c044eded8e7bab170bd81827c5 Mon Sep 17 00:00:00 2001 From: Randy Dunlap Date: Mon, 4 Mar 2013 14:32:54 -0800 Subject: [PATCH] --- yaml --- r: 361204 b: refs/heads/master c: 5857f70c8a62377c2304d8ad27e579881728fc5a h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/linux/idr.h | 2 +- trunk/lib/idr.c | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 203f77f425be..5b2ab43e322d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a3633f6730239e7d39316aeb119c1bb9e1e83d66 +refs/heads/master: 5857f70c8a62377c2304d8ad27e579881728fc5a diff --git a/trunk/include/linux/idr.h b/trunk/include/linux/idr.h index a6f38b5c34e4..8c1f81f823c8 100644 --- a/trunk/include/linux/idr.h +++ b/trunk/include/linux/idr.h @@ -99,7 +99,7 @@ static inline void idr_preload_end(void) /** * idr_find - return pointer for given id - * @idp: idr handle + * @idr: idr handle * @id: lookup key * * Return the pointer given the id it has been registered with. A %NULL diff --git a/trunk/lib/idr.c b/trunk/lib/idr.c index 00739aaf95a2..4f82a284c6a2 100644 --- a/trunk/lib/idr.c +++ b/trunk/lib/idr.c @@ -214,7 +214,6 @@ EXPORT_SYMBOL(idr_pre_get); * sub_alloc - try to allocate an id without growing the tree depth * @idp: idr handle * @starting_id: id to start search at - * @id: pointer to the allocated handle * @pa: idr_layer[MAX_IDR_LEVEL] used as backtrack buffer * @gfp_mask: allocation mask for idr_layer_alloc() * @layer_idr: optional idr passed to idr_layer_alloc()