forked from Minki/linux
kobject: remove kset_find_obj_hinted()
Now that there are no in-kernel users of this function, remove it as it is no longer needed. Signed-off-by: Kay Sievers <kay.sievers@vrfy.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
parent
a6ec0c03a0
commit
b3e8d7b247
@ -191,8 +191,6 @@ static inline struct kobj_type *get_ktype(struct kobject *kobj)
|
||||
}
|
||||
|
||||
extern struct kobject *kset_find_obj(struct kset *, const char *);
|
||||
extern struct kobject *kset_find_obj_hinted(struct kset *, const char *,
|
||||
struct kobject *);
|
||||
|
||||
/* The global /sys/kernel/ kobject for people to chain off of */
|
||||
extern struct kobject *kernel_kobj;
|
||||
|
@ -745,44 +745,12 @@ void kset_unregister(struct kset *k)
|
||||
* take a reference and return the object.
|
||||
*/
|
||||
struct kobject *kset_find_obj(struct kset *kset, const char *name)
|
||||
{
|
||||
return kset_find_obj_hinted(kset, name, NULL);
|
||||
}
|
||||
|
||||
/**
|
||||
* kset_find_obj_hinted - search for object in kset given a predecessor hint.
|
||||
* @kset: kset we're looking in.
|
||||
* @name: object's name.
|
||||
* @hint: hint to possible object's predecessor.
|
||||
*
|
||||
* Check the hint's next object and if it is a match return it directly,
|
||||
* otherwise, fall back to the behavior of kset_find_obj(). Either way
|
||||
* a reference for the returned object is held and the reference on the
|
||||
* hinted object is released.
|
||||
*/
|
||||
struct kobject *kset_find_obj_hinted(struct kset *kset, const char *name,
|
||||
struct kobject *hint)
|
||||
{
|
||||
struct kobject *k;
|
||||
struct kobject *ret = NULL;
|
||||
|
||||
spin_lock(&kset->list_lock);
|
||||
|
||||
if (!hint)
|
||||
goto slow_search;
|
||||
|
||||
/* end of list detection */
|
||||
if (hint->entry.next == kset->list.next)
|
||||
goto slow_search;
|
||||
|
||||
k = container_of(hint->entry.next, struct kobject, entry);
|
||||
if (!kobject_name(k) || strcmp(kobject_name(k), name))
|
||||
goto slow_search;
|
||||
|
||||
ret = kobject_get(k);
|
||||
goto unlock_exit;
|
||||
|
||||
slow_search:
|
||||
list_for_each_entry(k, &kset->list, entry) {
|
||||
if (kobject_name(k) && !strcmp(kobject_name(k), name)) {
|
||||
ret = kobject_get(k);
|
||||
@ -790,12 +758,7 @@ slow_search:
|
||||
}
|
||||
}
|
||||
|
||||
unlock_exit:
|
||||
spin_unlock(&kset->list_lock);
|
||||
|
||||
if (hint)
|
||||
kobject_put(hint);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user