Kobject: Replace list_for_each() with list_for_each_entry().
authorRobert P. J. Day <rpjday@crashcourse.ca>
Thu, 27 Mar 2008 05:13:34 +0000 (01:13 -0400)
committerGreg Kroah-Hartman <gregkh@suse.de>
Sun, 20 Apr 2008 02:10:27 +0000 (19:10 -0700)
Use the more concise list_for_each_entry(), which allows for the
deletion of the to_kobj() routine at the same time.

Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
lib/kobject.c

index 60ae9e817663441a951d15098e057a4cbc366e03..2c6490370922ccddf939db20e6bf0b71fcbf9526 100644 (file)
@@ -58,11 +58,6 @@ static int create_dir(struct kobject *kobj)
        return error;
 }
 
-static inline struct kobject *to_kobj(struct list_head *entry)
-{
-       return container_of(entry, struct kobject, entry);
-}
-
 static int get_kobj_path_length(struct kobject *kobj)
 {
        int length = 1;
@@ -752,12 +747,11 @@ void kset_unregister(struct kset *k)
  */
 struct kobject *kset_find_obj(struct kset *kset, const char *name)
 {
-       struct list_head *entry;
+       struct kobject *k;
        struct kobject *ret = NULL;
 
        spin_lock(&kset->list_lock);
-       list_for_each(entry, &kset->list) {
-               struct kobject *k = to_kobj(entry);
+       list_for_each_entry(k, &kset->list, entry) {
                if (kobject_name(k) && !strcmp(kobject_name(k), name)) {
                        ret = kobject_get(k);
                        break;