Commit ed3aefb3 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman

Kobject: add NULL to decl_subsys() due to addition of hotplug operations

parent ac6ecad3
...@@ -598,7 +598,7 @@ static struct kobj_type ktype_edd = { ...@@ -598,7 +598,7 @@ static struct kobj_type ktype_edd = {
.default_attrs = def_attrs, .default_attrs = def_attrs,
}; };
static decl_subsys(edd,&ktype_edd); static decl_subsys(edd,&ktype_edd,NULL);
/** /**
......
...@@ -676,7 +676,7 @@ acpi_bus_init (void) ...@@ -676,7 +676,7 @@ acpi_bus_init (void)
return_VALUE(-ENODEV); return_VALUE(-ENODEV);
} }
decl_subsys(acpi,NULL); decl_subsys(acpi,NULL,NULL);
static int __init acpi_init (void) static int __init acpi_init (void)
{ {
......
...@@ -132,7 +132,7 @@ static struct kobj_type ktype_bus = { ...@@ -132,7 +132,7 @@ static struct kobj_type ktype_bus = {
}; };
decl_subsys(bus,&ktype_bus); decl_subsys(bus,&ktype_bus,NULL);
/** /**
* bus_for_each_dev - device iterator. * bus_for_each_dev - device iterator.
......
...@@ -49,7 +49,9 @@ static struct kobj_type ktype_devclass = { ...@@ -49,7 +49,9 @@ static struct kobj_type ktype_devclass = {
.sysfs_ops = &class_sysfs_ops, .sysfs_ops = &class_sysfs_ops,
}; };
static decl_subsys(class,&ktype_devclass); /* Classes can't use the kobject hotplug logic, as
* they do not add new kobjects to the system */
static decl_subsys(class,&ktype_devclass,NULL);
static int devclass_dev_link(struct device_class * cls, struct device * dev) static int devclass_dev_link(struct device_class * cls, struct device * dev)
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/init.h> #include <linux/init.h>
static decl_subsys(firmware,NULL); static decl_subsys(firmware,NULL,NULL);
int firmware_register(struct subsystem * s) int firmware_register(struct subsystem * s)
{ {
......
...@@ -61,7 +61,7 @@ static struct file_system_type **find_filesystem(const char *name) ...@@ -61,7 +61,7 @@ static struct file_system_type **find_filesystem(const char *name)
/* define fs_subsys */ /* define fs_subsys */
static decl_subsys(fs, NULL); static decl_subsys(fs, NULL, NULL);
static int register_fs_subsys(struct file_system_type * fs) static int register_fs_subsys(struct file_system_type * fs)
{ {
......
...@@ -2815,7 +2815,7 @@ extern void ip_auto_config(void); ...@@ -2815,7 +2815,7 @@ extern void ip_auto_config(void);
extern void dv_init(void); extern void dv_init(void);
#endif /* CONFIG_NET_DIVERT */ #endif /* CONFIG_NET_DIVERT */
static decl_subsys(net,NULL); static decl_subsys(net,NULL,NULL);
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment