lkml.org 
[lkml]   [2008]   [Jan]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 082/196] kobject: convert arm/mach-omap1/pm.c to kobj_attr interface
    Date
    This makes the code a bit simpler and and gets us one step closer to
    deleting the deprecated subsys_attr code.

    Cc: Kay Sievers <kay.sievers@vrfy.org>
    Cc: Dirk Behme <dirk.behme@de.bosch.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    ---
    arch/arm/mach-omap1/pm.c | 22 ++++++++--------------
    1 files changed, 8 insertions(+), 14 deletions(-)
    diff --git a/arch/arm/mach-omap1/pm.c b/arch/arm/mach-omap1/pm.c
    index 402113c..63edafb 100644
    --- a/arch/arm/mach-omap1/pm.c
    +++ b/arch/arm/mach-omap1/pm.c
    @@ -69,14 +69,14 @@ static unsigned int mpui1610_sleep_save[MPUI1610_SLEEP_SAVE_SIZE];

    static unsigned short enable_dyn_sleep = 1;

    -static ssize_t omap_pm_sleep_while_idle_show(struct kset *kset, char *buf)
    +static ssize_t idle_show(struct kobject *kobj, struct kobj_attribute *attr,
    + char *buf)
    {
    return sprintf(buf, "%hu\n", enable_dyn_sleep);
    }

    -static ssize_t omap_pm_sleep_while_idle_store(struct kset *kset,
    - const char * buf,
    - size_t n)
    +static ssize_t idle_store(struct kobject *kobj, struct kobj_attribute *attr,
    + const char * buf, size_t n)
    {
    unsigned short value;
    if (sscanf(buf, "%hu", &value) != 1 ||
    @@ -88,14 +88,8 @@ static ssize_t omap_pm_sleep_while_idle_store(struct kset *kset,
    return n;
    }

    -static struct subsys_attribute sleep_while_idle_attr = {
    - .attr = {
    - .name = __stringify(sleep_while_idle),
    - .mode = 0644,
    - },
    - .show = omap_pm_sleep_while_idle_show,
    - .store = omap_pm_sleep_while_idle_store,
    -};
    +static struct kobj_attribute sleep_while_idle_attr =
    + __ATTR(sleep_while_idle, 0644, idle_show, idle_store);

    static void (*omap_sram_idle)(void) = NULL;
    static void (*omap_sram_suspend)(unsigned long r0, unsigned long r1) = NULL;
    @@ -725,9 +719,9 @@ static int __init omap_pm_init(void)
    omap_pm_init_proc();
    #endif

    - error = subsys_create_file(power_kset, &sleep_while_idle_attr);
    + error = sysfs_create_file(&power_kset->kobj, &sleep_while_idle_attr);
    if (error)
    - printk(KERN_ERR "subsys_create_file failed: %d\n", error);
    + printk(KERN_ERR "sysfs_create_file failed: %d\n", error);

    if (cpu_is_omap16xx()) {
    /* configure LOW_PWR pin */
    --
    1.5.3.8


    \
     
     \ /
      Last update: 2008-01-25 08:51    [from the cache]
    ©2003-2014 Jasper Spaans. hosted at Digital Ocean