summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'drivers')
-rw-r--r--drivers/acpi/bus.c2
-rw-r--r--drivers/base/firmware.c8
-rw-r--r--drivers/firmware/edd.c2
-rw-r--r--drivers/firmware/efivars.c2
-rw-r--r--drivers/parisc/pdc_stable.c2
5 files changed, 8 insertions, 8 deletions
diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c
index e550da6..1b4cf98 100644
--- a/drivers/acpi/bus.c
+++ b/drivers/acpi/bus.c
@@ -755,7 +755,7 @@ static int __init acpi_init(void)
return -ENODEV;
}
- acpi_kobj = kobject_create_and_add("acpi", &firmware_kset->kobj);
+ acpi_kobj = kobject_create_and_add("acpi", firmware_kobj);
if (!acpi_kobj) {
printk(KERN_WARNING "%s: kset create error\n", __FUNCTION__);
acpi_kobj = NULL;
diff --git a/drivers/base/firmware.c b/drivers/base/firmware.c
index 9efff48..1138155 100644
--- a/drivers/base/firmware.c
+++ b/drivers/base/firmware.c
@@ -15,13 +15,13 @@
#include "base.h"
-struct kset *firmware_kset;
-EXPORT_SYMBOL_GPL(firmware_kset);
+struct kobject *firmware_kobj;
+EXPORT_SYMBOL_GPL(firmware_kobj);
int __init firmware_init(void)
{
- firmware_kset = kset_create_and_add("firmware", NULL, NULL);
- if (!firmware_kset)
+ firmware_kobj = kobject_create_and_add("firmware", NULL);
+ if (!firmware_kobj)
return -ENOMEM;
return 0;
}
diff --git a/drivers/firmware/edd.c b/drivers/firmware/edd.c
index f07f370..ddcc957 100644
--- a/drivers/firmware/edd.c
+++ b/drivers/firmware/edd.c
@@ -756,7 +756,7 @@ edd_init(void)
return 1;
}
- edd_kset = kset_create_and_add("edd", NULL, &firmware_kset->kobj);
+ edd_kset = kset_create_and_add("edd", NULL, firmware_kobj);
if (!edd_kset)
return -ENOMEM;
diff --git a/drivers/firmware/efivars.c b/drivers/firmware/efivars.c
index e17cd81..d1ad481 100644
--- a/drivers/firmware/efivars.c
+++ b/drivers/firmware/efivars.c
@@ -668,7 +668,7 @@ efivars_init(void)
/*
* For now we'll register the efi subsys within this driver
*/
- efi_kset = kset_create_and_add("efi", NULL, &firmware_kset->kobj);
+ efi_kset = kset_create_and_add("efi", NULL, firmware_kobj);
if (!efi_kset) {
printk(KERN_ERR "efivars: Firmware registration failed.\n");
error = -ENOMEM;
diff --git a/drivers/parisc/pdc_stable.c b/drivers/parisc/pdc_stable.c
index 4444834..ef1a353 100644
--- a/drivers/parisc/pdc_stable.c
+++ b/drivers/parisc/pdc_stable.c
@@ -1059,7 +1059,7 @@ pdc_stable_init(void)
pdcs_osid = (u16)(result >> 16);
/* For now we'll register the stable kset within this driver */
- stable_kset = kset_create_and_add("stable", NULL, &firmware_kset->kobj);
+ stable_kset = kset_create_and_add("stable", NULL, firmware_kobj);
if (!stable_kset) {
rc = -ENOMEM;
goto fail_firmreg;
OpenPOWER on IntegriCloud