lkml.org 
[lkml]   [2007]   [Nov]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 20/54] kset: convert /sys/devices to use kset_create
    Date
    Dynamically create the kset instead of declaring it statically.  We also
    rename devices_subsys to devices_kset to catch all users of the
    variable.

    Cc: Kay Sievers <kay.sievers@vrfy.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    ---
    drivers/base/base.h | 2 +-
    drivers/base/core.c | 17 +++++++++--------
    drivers/base/power/shutdown.c | 2 +-
    drivers/base/sys.c | 4 +---
    4 files changed, 12 insertions(+), 13 deletions(-)

    diff --git a/drivers/base/base.h b/drivers/base/base.h
    index 10b2fb6..7e309a4 100644
    --- a/drivers/base/base.h
    +++ b/drivers/base/base.h
    @@ -44,4 +44,4 @@ extern char *make_class_name(const char *name, struct kobject *kobj);

    extern int devres_release_all(struct device *dev);

    -extern struct kset devices_subsys;
    +extern struct kset *devices_kset;
    diff --git a/drivers/base/core.c b/drivers/base/core.c
    index 161ea6e..80188ec 100644
    --- a/drivers/base/core.c
    +++ b/drivers/base/core.c
    @@ -401,11 +401,8 @@ static ssize_t show_dev(struct device *dev, struct device_attribute *attr,
    static struct device_attribute devt_attr =
    __ATTR(dev, S_IRUGO, show_dev, NULL);

    -/*
    - * devices_subsys - structure to be registered with kobject core.
    - */
    -
    -decl_subsys(devices, &device_uevent_ops);
    +/* kset to create /sys/devices/ */
    +struct kset *devices_kset;


    /**
    @@ -525,7 +522,7 @@ static void klist_children_put(struct klist_node *n)

    void device_initialize(struct device *dev)
    {
    - dev->kobj.kset = &devices_subsys;
    + dev->kobj.kset = devices_kset;
    dev->kobj.ktype = &device_ktype;
    kobject_init(&dev->kobj);
    klist_init(&dev->klist_children, klist_children_get,
    @@ -562,7 +559,7 @@ static struct kobject *virtual_device_parent(struct device *dev)
    static struct kobject *virtual_dir = NULL;

    if (!virtual_dir)
    - virtual_dir = kobject_add_dir(&devices_subsys.kobj, "virtual");
    + virtual_dir = kobject_add_dir(&devices_kset->kobj, "virtual");

    return virtual_dir;
    }
    @@ -1072,7 +1069,11 @@ struct device * device_find_child(struct device *parent, void *data,

    int __init devices_init(void)
    {
    - return subsystem_register(&devices_subsys);
    + devices_kset = kset_create_and_register("devices", &device_uevent_ops,
    + NULL, NULL);
    + if (IS_ERR(devices_kset))
    + return PTR_ERR(devices_kset);
    + return 0;
    }

    EXPORT_SYMBOL_GPL(device_for_each_child);
    diff --git a/drivers/base/power/shutdown.c b/drivers/base/power/shutdown.c
    index 56e8eaa..f51cbc1 100644
    --- a/drivers/base/power/shutdown.c
    +++ b/drivers/base/power/shutdown.c
    @@ -34,7 +34,7 @@ void device_shutdown(void)
    {
    struct device * dev, *devn;

    - list_for_each_entry_safe_reverse(dev, devn, &devices_subsys.list,
    + list_for_each_entry_safe_reverse(dev, devn, &devices_kset->list,
    kobj.entry) {
    if (dev->bus && dev->bus->shutdown) {
    dev_dbg(dev, "shutdown\n");
    diff --git a/drivers/base/sys.c b/drivers/base/sys.c
    index 7cf19fc..7693c95 100644
    --- a/drivers/base/sys.c
    +++ b/drivers/base/sys.c
    @@ -25,8 +25,6 @@

    #include "base.h"

    -extern struct kset devices_subsys;
    -
    #define to_sysdev(k) container_of(k, struct sys_device, kobj)
    #define to_sysdev_attr(a) container_of(a, struct sysdev_attribute, attr)

    @@ -459,7 +457,7 @@ int sysdev_resume(void)

    int __init system_bus_init(void)
    {
    - system_subsys.kobj.parent = &devices_subsys.kobj;
    + system_subsys.kobj.parent = &devices_kset->kobj;
    return subsystem_register(&system_subsys);
    }

    --
    1.5.3.4
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2007-11-03 01:11    [W:2.634 / U:0.112 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site