Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit ac3c8141f62f357169980ec21b7be6d29964a394

Authored by Greg Kroah-Hartman
1 parent 649316b25b
Exists in master and in 20 other branches dlt-processor-sdk-linux-03.00.00.04, newt-ti-linux-3.12.y, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.12.10, smarc-ti-linux-3.12.y, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.12.y, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

Kobject: convert kernel/module.c to use kobject_init/add_ng() 

This converts the code to use the new kobject functions, cleaning up the
logic in doing so.

Cc: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

Showing 1 changed file with 6 additions and 8 deletions Side-by-side Diff

... ... @@ -1217,18 +1217,16 @@
1217 1217 err = -EINVAL;
1218 1218 goto out;
1219 1219 }
  1220 + mod->mkobj.mod = mod;
  1221 +
1220 1222 memset(&mod->mkobj.kobj, 0, sizeof(mod->mkobj.kobj));
1221   - err = kobject_set_name(&mod->mkobj.kobj, "%s", mod->name);
1222   - if (err)
1223   - goto out;
1224 1223 mod->mkobj.kobj.kset = module_kset;
1225   - mod->mkobj.kobj.ktype = &module_ktype;
1226   - mod->mkobj.mod = mod;
  1224 + err = kobject_init_and_add(&mod->mkobj.kobj, &module_ktype, NULL,
  1225 + "%s", mod->name);
  1226 + if (err)
  1227 + kobject_put(&mod->mkobj.kobj);
1227 1228  
1228   - kobject_init(&mod->mkobj.kobj);
1229   -
1230 1229 /* delay uevent until full sysfs population */
1231   - err = kobject_add(&mod->mkobj.kobj);
1232 1230 out:
1233 1231 return err;
1234 1232 }