92b421416f
When SYSFS=n and MODULES=y, build ends with: linux-2.6.24-rc6-mm1/drivers/base/module.c: In function 'module_add_driver': linux-2.6.24-rc6-mm1/drivers/base/module.c:49: error: 'module_kset' undeclared (first use in this function) make[3]: *** [drivers/base/module.o] Error 1 Below is one possible fix. Build-tested with all 4 config combinations of SYSFS & MODULES. Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
92 lines
3.0 KiB
C
92 lines
3.0 KiB
C
|
|
/**
|
|
* struct bus_type_private - structure to hold the private to the driver core portions of the bus_type structure.
|
|
*
|
|
* @subsys - the struct kset that defines this bus. This is the main kobject
|
|
* @drivers_kset - the list of drivers associated with this bus
|
|
* @devices_kset - the list of devices associated with this bus
|
|
* @klist_devices - the klist to iterate over the @devices_kset
|
|
* @klist_drivers - the klist to iterate over the @drivers_kset
|
|
* @bus_notifier - the bus notifier list for anything that cares about things
|
|
* on this bus.
|
|
* @bus - pointer back to the struct bus_type that this structure is associated
|
|
* with.
|
|
*
|
|
* This structure is the one that is the actual kobject allowing struct
|
|
* bus_type to be statically allocated safely. Nothing outside of the driver
|
|
* core should ever touch these fields.
|
|
*/
|
|
struct bus_type_private {
|
|
struct kset subsys;
|
|
struct kset *drivers_kset;
|
|
struct kset *devices_kset;
|
|
struct klist klist_devices;
|
|
struct klist klist_drivers;
|
|
struct blocking_notifier_head bus_notifier;
|
|
unsigned int drivers_autoprobe:1;
|
|
struct bus_type *bus;
|
|
};
|
|
|
|
struct driver_private {
|
|
struct kobject kobj;
|
|
struct klist klist_devices;
|
|
struct klist_node knode_bus;
|
|
struct module_kobject *mkobj;
|
|
struct device_driver *driver;
|
|
};
|
|
#define to_driver(obj) container_of(obj, struct driver_private, kobj)
|
|
|
|
/* initialisation functions */
|
|
extern int devices_init(void);
|
|
extern int buses_init(void);
|
|
extern int classes_init(void);
|
|
extern int firmware_init(void);
|
|
#ifdef CONFIG_SYS_HYPERVISOR
|
|
extern int hypervisor_init(void);
|
|
#else
|
|
static inline int hypervisor_init(void) { return 0; }
|
|
#endif
|
|
extern int platform_bus_init(void);
|
|
extern int system_bus_init(void);
|
|
extern int cpu_dev_init(void);
|
|
|
|
extern int bus_add_device(struct device * dev);
|
|
extern void bus_attach_device(struct device * dev);
|
|
extern void bus_remove_device(struct device * dev);
|
|
|
|
extern int bus_add_driver(struct device_driver *);
|
|
extern void bus_remove_driver(struct device_driver *);
|
|
|
|
extern void driver_detach(struct device_driver * drv);
|
|
extern int driver_probe_device(struct device_driver *, struct device *);
|
|
|
|
extern void sysdev_shutdown(void);
|
|
extern int sysdev_suspend(pm_message_t state);
|
|
extern int sysdev_resume(void);
|
|
|
|
static inline struct class_device *to_class_dev(struct kobject *obj)
|
|
{
|
|
return container_of(obj, struct class_device, kobj);
|
|
}
|
|
|
|
static inline
|
|
struct class_device_attribute *to_class_dev_attr(struct attribute *_attr)
|
|
{
|
|
return container_of(_attr, struct class_device_attribute, attr);
|
|
}
|
|
|
|
extern char *make_class_name(const char *name, struct kobject *kobj);
|
|
|
|
extern int devres_release_all(struct device *dev);
|
|
|
|
extern struct kset *devices_kset;
|
|
|
|
#if defined(CONFIG_MODULES) && defined(CONFIG_SYSFS)
|
|
extern void module_add_driver(struct module *mod, struct device_driver *drv);
|
|
extern void module_remove_driver(struct device_driver *drv);
|
|
#else
|
|
static inline void module_add_driver(struct module *mod,
|
|
struct device_driver *drv) { }
|
|
static inline void module_remove_driver(struct device_driver *drv) { }
|
|
#endif
|