Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 78a2d906b40fe530ea800c1e873bfe8f02326f1e

Authored by Greg Kroah-Hartman
1 parent 197b12d679
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

Kobject: convert remaining kobject_unregister() to kobject_put() 

There is no need for kobject_unregister() anymore, thanks to Kay's
kobject cleanup changes, so replace all instances of it with
kobject_put().


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

Showing 5 changed files with 9 additions and 10 deletions Side-by-side Diff

... ... @@ -154,7 +154,7 @@
154 154 group_exit:
155 155 sysfs_remove_group(kernel_kobj, &kernel_attr_group);
156 156 kset_exit:
157   - kobject_unregister(kernel_kobj);
  157 + kobject_put(kernel_kobj);
158 158 exit:
159 159 return error;
160 160 }
... ... @@ -1257,9 +1257,8 @@
1257 1257 out_unreg_param:
1258 1258 module_param_sysfs_remove(mod);
1259 1259 out_unreg_holders:
1260   - kobject_unregister(mod->holders_dir);
  1260 + kobject_put(mod->holders_dir);
1261 1261 out_unreg:
1262   - kobject_del(&mod->mkobj.kobj);
1263 1262 kobject_put(&mod->mkobj.kobj);
1264 1263 return err;
1265 1264 }
... ... @@ -1269,9 +1268,9 @@
1269 1268 {
1270 1269 module_remove_modinfo_attrs(mod);
1271 1270 module_param_sysfs_remove(mod);
1272   - kobject_unregister(mod->mkobj.drivers_dir);
1273   - kobject_unregister(mod->holders_dir);
1274   - kobject_unregister(&mod->mkobj.kobj);
  1271 + kobject_put(mod->mkobj.drivers_dir);
  1272 + kobject_put(mod->holders_dir);
  1273 + kobject_put(&mod->mkobj.kobj);
1275 1274 }
1276 1275  
1277 1276 /*
... ... @@ -664,7 +664,7 @@
664 664 *
665 665 * This function creates a kset structure dynamically and registers it
666 666 * with sysfs. When you are finished with this structure, call
667   - * kobject_unregister() and the structure will be dynamically freed when
  667 + * kobject_put() and the structure will be dynamically freed when
668 668 * it is no longer being used.
669 669 *
670 670 * If the kobject was not able to be created, NULL will be returned.
... ... @@ -761,7 +761,7 @@
761 761 {
762 762 if (!k)
763 763 return;
764   - kobject_unregister(&k->kobj);
  764 + kobject_put(&k->kobj);
765 765 }
766 766  
767 767  
net/bridge/br_sysfs_br.c
Diff comments   View file @ 78a2d90
... ... @@ -447,7 +447,7 @@
447 447 struct kobject *kobj = &dev->dev.kobj;
448 448 struct net_bridge *br = netdev_priv(dev);
449 449  
450   - kobject_unregister(br->ifobj);
  450 + kobject_put(br->ifobj);
451 451 sysfs_remove_bin_file(kobj, &bridge_forward);
452 452 sysfs_remove_group(kobj, &bridge_group);
453 453 }
... ... @@ -327,7 +327,7 @@
327 327  
328 328 retval = register_filesystem(&fs_type);
329 329 if (retval)
330   - kobject_unregister(security_kobj);
  330 + kobject_put(security_kobj);
331 331 return retval;
332 332 }
333 333