Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit f62ed9e33b3ccff54d66b08f82d11940bb9e269b

Authored by Greg Kroah-Hartman
1 parent 15f2f9b3a9
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

firmware: change firmware_kset to firmware_kobj 

There is no firmware "subsystem" it's just a directory in /sys that
other portions of the kernel want to hook into.  So make it a kobject
not a kset to help alivate anyone who tries to do some odd kset-like
things with this.

Cc: Kay Sievers <kay.sievers@vrfy.org>
Cc: Cornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

Showing 7 changed files with 14 additions and 14 deletions Side-by-side Diff

arch/s390/kernel/ipl.c
Diff comments   View file @ f62ed9e
... ... @@ -855,7 +855,7 @@
855 855 {
856 856 int rc;
857 857  
858   - ipl_kset = kset_create_and_add("ipl", NULL, &firmware_kset->kobj);
  858 + ipl_kset = kset_create_and_add("ipl", NULL, firmware_kobj);
859 859 if (!ipl_kset)
860 860 return -ENOMEM;
861 861 switch (ipl_info.type) {
... ... @@ -974,7 +974,7 @@
974 974 {
975 975 int rc;
976 976  
977   - reipl_kset = kset_create_and_add("reipl", NULL, &firmware_kset->kobj);
  977 + reipl_kset = kset_create_and_add("reipl", NULL, firmware_kobj);
978 978 if (!reipl_kset)
979 979 return -ENOMEM;
980 980 rc = sysfs_create_file(&reipl_kset->kobj, &reipl_type_attr.attr);
... ... @@ -1063,7 +1063,7 @@
1063 1063 {
1064 1064 int rc;
1065 1065  
1066   - dump_kset = kset_create_and_add("dump", NULL, &firmware_kset->kobj);
  1066 + dump_kset = kset_create_and_add("dump", NULL, firmware_kobj);
1067 1067 if (!dump_kset)
1068 1068 return -ENOMEM;
1069 1069 rc = sysfs_create_file(&dump_kset->kobj, &dump_type_attr);
... ... @@ -1086,7 +1086,7 @@
1086 1086 int rc;
1087 1087  
1088 1088 shutdown_actions_kset = kset_create_and_add("shutdown_actions", NULL,
1089   - &firmware_kset->kobj);
  1089 + firmware_kobj);
1090 1090 if (!shutdown_actions_kset)
1091 1091 return -ENOMEM;
1092 1092 rc = sysfs_create_file(&shutdown_actions_kset->kobj, &on_panic_attr);
... ... @@ -755,7 +755,7 @@
755 755 return -ENODEV;
756 756 }
757 757  
758   - acpi_kobj = kobject_create_and_add("acpi", &firmware_kset->kobj);
  758 + acpi_kobj = kobject_create_and_add("acpi", firmware_kobj);
759 759 if (!acpi_kobj) {
760 760 printk(KERN_WARNING "%s: kset create error\n", __FUNCTION__);
761 761 acpi_kobj = NULL;
drivers/base/firmware.c
Diff comments   View file @ f62ed9e
... ... @@ -15,13 +15,13 @@
15 15  
16 16 #include "base.h"
17 17  
18   -struct kset *firmware_kset;
19   -EXPORT_SYMBOL_GPL(firmware_kset);
  18 +struct kobject *firmware_kobj;
  19 +EXPORT_SYMBOL_GPL(firmware_kobj);
20 20  
21 21 int __init firmware_init(void)
22 22 {
23   - firmware_kset = kset_create_and_add("firmware", NULL, NULL);
24   - if (!firmware_kset)
  23 + firmware_kobj = kobject_create_and_add("firmware", NULL);
  24 + if (!firmware_kobj)
25 25 return -ENOMEM;
26 26 return 0;
27 27 }
drivers/firmware/edd.c
Diff comments   View file @ f62ed9e
... ... @@ -756,7 +756,7 @@
756 756 return 1;
757 757 }
758 758  
759   - edd_kset = kset_create_and_add("edd", NULL, &firmware_kset->kobj);
  759 + edd_kset = kset_create_and_add("edd", NULL, firmware_kobj);
760 760 if (!edd_kset)
761 761 return -ENOMEM;
762 762  
drivers/firmware/efivars.c
Diff comments   View file @ f62ed9e
... ... @@ -668,7 +668,7 @@
668 668 /*
669 669 * For now we'll register the efi subsys within this driver
670 670 */
671   - efi_kset = kset_create_and_add("efi", NULL, &firmware_kset->kobj);
  671 + efi_kset = kset_create_and_add("efi", NULL, firmware_kobj);
672 672 if (!efi_kset) {
673 673 printk(KERN_ERR "efivars: Firmware registration failed.\n");
674 674 error = -ENOMEM;
drivers/parisc/pdc_stable.c
Diff comments   View file @ f62ed9e
... ... @@ -1059,7 +1059,7 @@
1059 1059 pdcs_osid = (u16)(result >> 16);
1060 1060  
1061 1061 /* For now we'll register the stable kset within this driver */
1062   - stable_kset = kset_create_and_add("stable", NULL, &firmware_kset->kobj);
  1062 + stable_kset = kset_create_and_add("stable", NULL, firmware_kobj);
1063 1063 if (!stable_kset) {
1064 1064 rc = -ENOMEM;
1065 1065 goto fail_firmreg;
include/linux/kobject.h
Diff comments   View file @ f62ed9e
... ... @@ -210,8 +210,8 @@
210 210 extern struct kobject *hypervisor_kobj;
211 211 /* The global /sys/power/ kset for people to chain off of */
212 212 extern struct kset *power_kset;
213   -/* The global /sys/firmware/ kset for people to chain off of */
214   -extern struct kset *firmware_kset;
  213 +/* The global /sys/firmware/ kobject for people to chain off of */
  214 +extern struct kobject *firmware_kobj;
215 215  
216 216 extern int __must_check subsystem_register(struct kset *);
217 217 extern void subsystem_unregister(struct kset *);